Antwrap 0.3 → 0.4

data/docs/index.html

@@ -53,29 +53,10 @@ circumstances):
 <pre><li>There are some reserved words that we have to work around. For example, Ant-Contrib tasks such as 'if' and 'else'
 conflict with the Ruby reserved words. Under most circumstances, you won't need to use these tasks (indeed, the 
 awkwardness of conditional operations in Ant scripts is likely one of the reasons why you want to move to a build system 
-such as Rake). 
-
-Nevertheless, there are that occasions demands it. One such situation is the &lt;java&gt; Ant task. The 'java'
-symbol conflicts with a symbol in the JRuby library. 
-
-Reserved words like this can be worked around by simply prepending an underscore character ('_') to the task:
+such as Rake). Nevertheless, there are that occasions demands it. Reserved words like this can be worked around by simply prepending an 
+underscore character ('_') to the task:
 
 <code lang="ruby">
-    @ant._java(:classname => 'foo.bar.FooBar', :fork => 'false') {
-      arg(:value => 'argOne')
-      classpath(){
-        pathelement(:location => '${output_dir}/classes')
-        pathelement(:location => '${resource_dir}/parent.jar')
-      }
-      arg(:value => 'argTwo')
-      jvmarg(:value => 'client')
-      sysproperty(:key=> 'antwrap', :value => 'coolio')
-    }
-    
-    #Because the 'java' Ant task is likely to be very popular, there is an alias you can use called 'jvm'.
-    #The above task could be rewritten as:
-    @ant.jvm(:classname => 'foo.bar.FooBar', :fork => 'false') {...
-    
     #This is an example of the Ant-Contrib tasks.
     #note: I added an underscore to 'equals' even though it isn't a reserved word. 
     #This makes the code block more symmetrical (it's not required though). It also 

data/lib/antwrap.rb

@@ -4,43 +4,39 @@
 #
 # Licensed under the LGPL, see the file COPYING in the distribution
 #
-require 'fileutils'
-require 'logger'
-require 'java'
 
 module ApacheAnt
-  include_class "org.apache.tools.ant.UnknownElement"
-  include_class "org.apache.tools.ant.RuntimeConfigurable"
-  include_class "org.apache.tools.ant.Project"
+  require 'java'
   include_class "org.apache.tools.ant.DefaultLogger"
-  include_class "org.apache.tools.ant.Target"
   include_class "org.apache.tools.ant.Main"
+  include_class "org.apache.tools.ant.Project"
+  include_class "org.apache.tools.ant.RuntimeConfigurable"
+  include_class "org.apache.tools.ant.Target"
+  include_class "org.apache.tools.ant.UnknownElement"
 end
 
 module JavaLang
+  require 'java'
   include_class "java.lang.System"
 end
 
 class AntTask
   private
   @@task_stack = Array.new
-  attr_reader :unknown_element, :project, :taskname, :logger
+  attr_reader :unknown_element, :project, :taskname, :logger, :executed
   
   public  
   def initialize(taskname, antProject, attributes, proc)
-    if(taskname[0,1] == "_")
-      taskname = taskname[1, taskname.length-1]
-    end
+    taskname = taskname[1, taskname.length-1] if taskname[0,1] == "_"
     @logger = antProject.logger
-    @logger.debug("AntTask.taskname: #{taskname}, antProject:#{antProject}, atts:#{attributes.to_s}, proc:#{proc.to_s}")
     @taskname = taskname
     @project_wrapper = antProject
     @project = antProject.project()
-    @logger.debug(@project)
+    @logger.debug(antProject.to_s)
     @unknown_element = create_unknown_element(@project, taskname)
-    @logger.debug("1")
+    @logger.debug(to_s)
+    
     addAttributes(attributes)
-    @logger.debug("2")
     
     if proc
       @logger.debug("task_stack.push #{taskname} >> #{@@task_stack}") 
@@ -55,43 +51,52 @@ class AntTask
       proc.instance_eval &proc
       @@task_stack.pop 
     end
-    @logger.debug("3")
     
   end
   
   def create_unknown_element(project, taskname)
+    
     unknown_element = ApacheAnt::UnknownElement.new(taskname)
     unknown_element.project= project
     unknown_element.owningTarget= ApacheAnt::Target.new()
-    unknown_element.namespace= ''
-    unknown_element.QName= taskname
-    unknown_element.taskType= taskname
     unknown_element.taskName= taskname
+    
+    if(@project_wrapper.ant_version >= 1.6)
+      unknown_element.taskType= taskname
+      unknown_element.namespace= ''
+      unknown_element.QName= taskname
+    end
+    
     return unknown_element
+    
   end
   
   def addAttributes(attributes)
+    
+    return if attributes == nil
+    
     wrapper = ApacheAnt::RuntimeConfigurable.new(@unknown_element, @unknown_element.getTaskName());
-    attributes.each do |key, val| 
-      if(key.to_s != 'pcdata')
-        wrapper.setAttribute(key.to_s, val)
-      else
-        wrapper.addText(val)
+    outer_func = lambda{ |key, val, tfunc|  key == 'pcdata' ? wrapper.addText(val) : tfunc.call(key, val) }
+    
+    if(@project_wrapper.ant_version >= 1.6)
+      attributes.each do |key, val| 
+        outer_func.call(key.to_s, val, lambda{|k,v| wrapper.setAttribute(k, val)}) 
       end
-    end unless attributes == nil
+    else  
+      @unknown_element.setRuntimeConfigurableWrapper(wrapper)
+      attribute_list = org.xml.sax.helpers.AttributeListImpl.new()
+      attributes.each do |key, val| 
+        outer_func.call(key.to_s, val, lambda{|k,v| attribute_list.addAttribute(k, 'CDATA', v)})
+      end
+      wrapper.setAttributes(attribute_list)
+    end
+    
   end
   
   def method_missing(sym, *args)
-    @logger.debug("AntTask.method_missing sym[#{sym.to_s}]")
     begin
-      proc = block_given? ? Proc.new : nil 
-      if(@project_wrapper.ant_version < 1.6)
-        @logger.debug("Creating a 1.5. task")
-        task = Ant15Task.new(sym.to_s, @project_wrapper, args[0], proc)
-      else
-        task = AntTask.new(sym.to_s, @project_wrapper, args[0], proc)
-      end
-      
+      @logger.debug("AntTask.method_missing sym[#{sym.to_s}]")
+      task = AntTask.new(sym.to_s, @project_wrapper, args[0], block_given? ? Proc.new : nil)
       self.add(task)
     rescue StandardError
       @logger.error("AntTask.method_missing error:" + $!)
@@ -99,7 +104,7 @@ class AntTask
   end  
   
   def add(child)
-    @logger.debug("adding child[#{child.unknown_element().getTaskName()}] to [#{@unknown_element.getTaskName()}]")
+    @logger.debug("adding child[#{child.taskname}] to [#{@taskname}]")
     @unknown_element.addChild(child.unknown_element())
     @unknown_element.getRuntimeConfigurableWrapper().addChild(child.unknown_element().getRuntimeConfigurableWrapper())
   end
@@ -110,56 +115,14 @@ class AntTask
     @executed = true
   end
   
-  def was_executed?
-    @executed
-  end
-  
-  #overridden. 'mkdir' conflicts wth the rake library.
-  def mkdir(attributes)
-    create_task('mkdir', attributes, (block_given? ? Proc.new : nil))
-  end  
-  
-  #overridden. 'copy' conflicts wth the rake library.
-  def copy(attributes)
-    create_task('copy', attributes, (block_given? ? Proc.new : nil))
-  end  
-  
-  #overridden. 'java' conflicts wth the JRuby library.
-  def jvm(attributes=Hash.new)
-    create_task('java', attributes, (block_given? ? Proc.new : nil))
-  end  
-  
-end
-
-class Ant15Task < AntTask
-  
-  def create_unknown_element(project, taskname)
-    unknown_element = ApacheAnt::UnknownElement.new(taskname)
-    unknown_element.project= project
-    unknown_element.owningTarget= ApacheAnt::Target.new()
-    unknown_element.taskName= taskname
-    return unknown_element
-  end
-  
-  def addAttributes(attributes)
-    wrapper = ApacheAnt::RuntimeConfigurable.new(@unknown_element, @unknown_element.getTaskName());
-    @unknown_element.setRuntimeConfigurableWrapper(wrapper)
-    attribute_list = org.xml.sax.helpers.AttributeListImpl.new
-    
-    attributes.each do |key, val| 
-      if(key.to_s != 'pcdata')
-        attribute_list.addAttribute(key.to_s, 'CDATA', val)
-      else
-        wrapper.addText(val)
-      end
-    end unless attributes == nil
-    wrapper.setAttributes(attribute_list)
-  end
+  def to_s
+    return self.class.name + "[#{@taskname}]"
+  end 
   
 end
 
 class AntProject
-  
+  require 'logger'
   attr :project, false
   attr :version, false
   attr :ant_version, true
@@ -196,8 +159,8 @@ class AntProject
     self.declarative= options[:declarative] || true      
     default_logger = ApacheAnt::DefaultLogger.new
     default_logger.messageOutputLevel= 2
-    default_logger.outputPrintStream= JavaLang::System.out
-    default_logger.errorPrintStream= JavaLang::System.err
+    default_logger.outputPrintStream= options[:outputstr] || JavaLang::System.out
+    default_logger.errorPrintStream= options[:errorstr] || JavaLang::System.err
     default_logger.emacsMode= false
     @project.addBuildListener default_logger
     @version = ApacheAnt::Main.getAntVersion
@@ -211,25 +174,15 @@ class AntProject
     @logger.debug("Antproject.create_task.taskname = " + taskname)
     @logger.debug("Antproject.create_task.attributes = " + attributes.to_s)
     
-    task = nil;
-    if(ant_version < 1.6)
-      task = Ant15Task.new(taskname, self, attributes, proc)
-    else
-      task = AntTask.new(taskname, self, attributes, proc)
-    end
-    
+    task = AntTask.new(taskname, self, attributes, proc)
     task.execute if declarative
-    if taskname == 'macrodef'
-      @logger.debug("Pushing #{attributes[:name]} to tasks")
-    end
-    task
+    return task
   end
   
   def method_missing(sym, *args)
     begin
-      @logger.info("AntProject.method_missing sym[#{sym.to_s}]")
-      proc = block_given? ? Proc.new : nil 
-      return create_task(sym.to_s, args[0], proc)
+      @logger.debug("AntProject.method_missing sym[#{sym.to_s}]")
+      return create_task(sym.to_s, args[0], block_given? ? Proc.new : nil)
     rescue
       @logger.error("Error instantiating task[#{sym.to_s}]" + $!)
     end
@@ -243,19 +196,14 @@ class AntProject
     return @project.getBaseDir().getAbsolutePath();
   end
   
-  #overridden. 'mkdir' conflicts wth the rake library.
-  def mkdir(attributes)
-    create_task('mkdir', attributes, (block_given? ? Proc.new : nil))
-  end  
+  def to_s
+    return self.class.name + "[#{@project.name}]"
+  end 
   
-  #overridden. 'copy' conflicts wth the rake library.
-  def copy(attributes)
-    create_task('copy', attributes, (block_given? ? Proc.new : nil))
-  end  
-  
-  #overridden. 'java' conflicts wth the JRuby library.
-  def jvm(attributes=Hash.new)
+  #This method invokes create_task. It is here to prevent conflicts wth the JRuby library
+  #over the 'java' symbol.
+  def java(attributes=Hash.new)
     create_task('java', attributes, (block_given? ? Proc.new : nil))
   end  
   
-end
+end

data/lib/rakefile.rb

@@ -0,0 +1,101 @@
+require 'antwrap.rb'
+
+module Raven
+
+  # The AntBuilderTask lets you execute Ant tasks directly from
+  # your rakefile. For example:
+  #
+  # ant 'runant' do
+  #   echo(:text => "Using echo Ant task.")
+  # end
+  #
+  # This task is different from other Raven tasks because its 
+  # body (or block if you prefer) isn't executed by Rake but
+  # within the Ant interpreter (AntBuilder). Therefore the
+  # task object isn't available within the code block as with
+  # other tasks.
+  #
+  # For more information about the syntax to use to call Ant
+  # tasks see http://antbuilder.rubyforge.org/
+  class AntBuilderTask < Rake::Task
+    attr_writer :body
+
+    def execute
+      super
+        current_dir = application.original_dir()
+        ant_project = AntProject.new({:name=>"testProject", :basedir=>current_dir, :declarative=>true, 
+                        :logger=>Logger.new(STDOUT), :loglevel=>Logger::ERROR})
+        ant_project.instance_eval(&@body)
+    end
+  end
+end
+
+def ant(args, &block)
+    ant_task = Raven::AntBuilderTask.define_task(args)
+    ant_task.body = block
+end
+
+ant 'runant' do
+ mkdir(:dir => 'foo')
+ echo(:message => "Using echo Ant task.")
+ echo(:pcdata => "Using echo Ant task.")
+end
+
+ant :ant_echo do
+  echo(:message => "Calling Ant <echo> task")
+end
+
+ant 'antcontrib' do 
+    taskdef(:resource => "net/sf/antcontrib/antlib.xml")
+
+    property(:name => "bar", :value => "bar")
+    _if(){
+      equals(:arg1 => "${bar}", :arg2 => "bar")
+      _then(){
+        echo(:message => "if 1 is equal")
+      }
+      _else(){
+        echo(:message => "if 1 is not equal")
+      }
+    }
+
+    property(:name => "baz", :value => "foo")
+    _if(){
+      equals(:arg1 => "${baz}", :arg2 => "bar")
+      _then(){
+        echo(:message => "if 2 is equal")
+      }
+      _else(){
+        echo(:message => "if 2 is not equal")
+      }
+    }
+end
+
+ant 'macrodef' do
+    dir = 'foo'
+    
+    assert_absent dir
+    
+    macrodef(:name => 'testmacrodef'){
+      attribute(:name => 'destination')
+      sequential(){
+        echo(:message => "Creating @{destination}")
+        _mkdir(:dir => "@{destination}")
+      }
+    }
+    testmacrodef(:destination => dir)
+    assert_exists dir
+    
+    puts "Cleaning up and deleting #{dir}"
+    
+    Dir.delete dir
+    
+end
+
+def assert_exists(file_path)
+    puts "Does not exist[#{file_path}]" if !File.exists?(file_path) 
+end
+  
+def assert_absent(file_path)
+    puts "Should not exist[#{file_path}]" if File.exists?(file_path)
+end

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

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

data/test/tc_antwrap.rb

@@ -7,6 +7,26 @@
 require 'test/unit'
 require 'fileutils'
 require '../lib/antwrap.rb'
+require 'java'
+class TestStream < java.io.PrintStream
+    attr_reader :last_line
+    
+    def initialise(out)
+      self.super(out)
+    end
+    
+    def println(s)
+      puts "s"
+      @last_line = s
+      self.super(s)
+    end
+    
+    def print(s)
+      puts "s"
+      @last_line = s
+      self.super(s)
+    end
+end
 
 class TestAntwrap < Test::Unit::TestCase
   
@@ -134,7 +154,7 @@ class TestAntwrap < Test::Unit::TestCase
     
     @ant.property(:name => 'output_dir', :value => @output_dir)
     @ant.property(:name => 'resource_dir', :value =>@resource_dir)
-    @ant._java(:classname => 'foo.bar.FooBar', :fork => 'false') {
+    @ant.java(:classname => 'foo.bar.FooBar', :fork => 'false') {
       arg(:value => 'argOne')
       classpath(){
         pathelement(:location => '${output_dir}/classes')
@@ -147,7 +167,14 @@ class TestAntwrap < Test::Unit::TestCase
   end
   
   def test_echo_task
-    @ant.echo(:message => "Antwrap is running an Echo task", :level => 'info')
+#    stream = TestStream.new(java.lang.System.out)
+#    
+#    @ant = AntProject.new({:name=>"testProject", :basedir=>@current_dir, :declarative=>true, 
+#                        :logger=>Logger.new(STDOUT), :loglevel=>Logger::DEBUG, :outputstr => stream})                            
+    msg = "Antwrap is running an Echo task"                    
+    @ant.echo(:message => msg, :level => 'info')
+#    assert(stream.last_line, stream.last_line == msg)
+    
     @ant.echo(:pcdata => "<foo&bar>")
   end
   

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: Antwrap
 version: !ruby/object:Gem::Version 
-  version: "0.3"
-date: 2007-02-19
+  version: "0.4"
+date: 2007-03-04
 summary: "A JRuby module that wraps the Apache Ant build tool, enabling Ant Tasks to be
   invoked from a JRuby script."
 require_paths: 
@@ -30,12 +30,15 @@ authors:
 files: 
   - lib/antwrap.rb
   - lib/convert.rb
+  - lib/rakefile.rb
   - test/output
   - test/tc_antwrap.rb
   - test/tc_convert.rb
-  - test/test
   - test/test-resources
-  - test/test/output
+  - test/output/META-INF
+  - test/output/parent
+  - test/output/META-INF/MANIFEST.MF
+  - test/output/parent/FooBarParent.class
   - test/test-resources/build.xml
   - test/test-resources/foo.txt
   - test/test-resources/foo.zip