Antwrap 0.4 → 0.5.0

data/docs/index.html

@@ -38,7 +38,7 @@ upon the invocation of the execute() method (this is a more Object Oriented appr
 circumstances):
 
 <code lang="ruby">
-    @ant = AntProject.new({:name=&gt"FooProject", :declarative=&gttrue})
+    @ant = AntProject.new({:name=&gt"FooProject", :declarative=&gt false})
 
     javac_task = @ant.javac(:srcdir =&gt; "test", :destdir =&gt; "classes"){
         classpath(:refid =&gt; "common.class.path")

data/lib/antwrap.rb

@@ -5,26 +5,44 @@
 # Licensed under the LGPL, see the file COPYING in the distribution
 #
 
-module ApacheAnt
-  require 'java'
-  include_class "org.apache.tools.ant.DefaultLogger"
-  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"
+if(RUBY_PLATFORM == 'java')
+  require 'jruby_modules.rb'
+else
+  require 'rjb_modules.rb'
 end
 
 class AntTask
   private
   @@task_stack = Array.new
-  attr_reader :unknown_element, :project, :taskname, :logger, :executed
+  attr_accessor(:unknown_element, :project, :taskname, :logger, :executed)
+  
+  def create_unknown_element(project, taskname)
+    
+    element = ApacheAnt::UnknownElement.new(taskname)
+    element.setProject(project)
+    element.setOwningTarget(ApacheAnt::Target.new())
+    element.setTaskName(taskname)
+    
+    if(@project_wrapper.ant_version >= 1.6)
+      element.setTaskType(taskname)
+      element.setNamespace('')
+      element.setQName(taskname)
+    end
+    
+    return element
+    
+  end
   
+  def method_missing(sym, *args)
+    begin
+      @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:" + $!)
+    end
+  end  
+    
   public  
   def initialize(taskname, antProject, attributes, proc)
     taskname = taskname[1, taskname.length-1] if taskname[0,1] == "_"
@@ -39,7 +57,7 @@ class AntTask
     addAttributes(attributes)
     
     if proc
-      @logger.debug("task_stack.push #{taskname} >> #{@@task_stack}") 
+#      @logger.debug("task_stack.push #{taskname} >> #{@@task_stack}") 
       @@task_stack.push self
       
       singleton_class = class << proc; self; end
@@ -54,23 +72,9 @@ class AntTask
     
   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.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
   
+  # Sets each attribute on the AntTask instance.
+  # :attributes - is a Hash.
   def addAttributes(attributes)
     
     return if attributes == nil
@@ -93,22 +97,17 @@ class AntTask
     
   end
   
-  def method_missing(sym, *args)
-    begin
-      @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:" + $!)
-    end
-  end  
-  
+  #Add <em>child</em> as a child of this task. 
   def add(child)
-    @logger.debug("adding child[#{child.taskname}] to [#{@taskname}]")
-    @unknown_element.addChild(child.unknown_element())
-    @unknown_element.getRuntimeConfigurableWrapper().addChild(child.unknown_element().getRuntimeConfigurableWrapper())
+#    @logger.debug("adding child[#{child.taskname()}] to [#{@taskname}]")
+    @unknown_element.addChild(child.getUnknownElement())
+    @unknown_element.getRuntimeConfigurableWrapper().addChild(child.getUnknownElement().getRuntimeConfigurableWrapper())
   end
   
+  def getUnknownElement
+    return @unknown_element
+  end
+  #Invokes the AntTask. 
   def execute
     @unknown_element.maybeConfigure
     @unknown_element.execute
@@ -152,17 +151,17 @@ class AntProject
   #   -Defaults to Logger::ERROR
   def initialize(options=Hash.new)
     @project= ApacheAnt::Project.new
-    @project.name= options[:name] || ''
-    @project.default= ''
-    @project.basedir= options[:basedir] || '.'
+    @project.setName(options[:name] || '')
+    @project.setDefault('')
+    @project.setBasedir(options[:basedir] || '.')
     @project.init
     self.declarative= options[:declarative] || true      
     default_logger = ApacheAnt::DefaultLogger.new
-    default_logger.messageOutputLevel= 2
-    default_logger.outputPrintStream= options[:outputstr] || JavaLang::System.out
-    default_logger.errorPrintStream= options[:errorstr] || JavaLang::System.err
-    default_logger.emacsMode= false
-    @project.addBuildListener default_logger
+    default_logger.setMessageOutputLevel(2)
+    default_logger.setOutputPrintStream(options[:outputstr] || JavaLang::System.out)
+    default_logger.setErrorPrintStream(options[:errorstr] || JavaLang::System.err)
+    default_logger.setEmacsMode(false)
+    @project.addBuildListener(default_logger)
     @version = ApacheAnt::Main.getAntVersion
     @ant_version = @version[/\d\.\d\.\d/].to_f
     @logger = options[:logger] || Logger.new(STDOUT)
@@ -171,8 +170,8 @@ class AntProject
   end
   
   def create_task(taskname, attributes, proc)
-    @logger.debug("Antproject.create_task.taskname = " + taskname)
-    @logger.debug("Antproject.create_task.attributes = " + attributes.to_s)
+    @logger.debug("AntProject.create_task.taskname = " + taskname)
+    @logger.debug("AntProject.create_task.attributes = " + attributes.to_s)
     
     task = AntTask.new(taskname, self, attributes, proc)
     task.execute if declarative
@@ -188,18 +187,20 @@ class AntProject
     end
   end
   
+  #The Ant Project's name. Default is ''.
   def name()
-    return @project.name
+    return @project.getName
   end
   
+  #The Ant Project's basedir. Default is '.'.
   def basedir()
     return @project.getBaseDir().getAbsolutePath();
   end
   
   def to_s
-    return self.class.name + "[#{@project.name}]"
+    return self.class.name + "[#{@project.getName()}]"
   end 
-  
+
   #This method invokes create_task. It is here to prevent conflicts wth the JRuby library
   #over the 'java' symbol.
   def java(attributes=Hash.new)

data/lib/jruby_modules.rb

@@ -0,0 +1,14 @@
+module ApacheAnt
+  require 'java'
+  include_class "org.apache.tools.ant.DefaultLogger"
+  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

data/lib/rjb_modules.rb

@@ -0,0 +1,16 @@
+module ApacheAnt
+  require 'rubygems'
+  require 'rjb'
+  DefaultLogger =  Rjb::import("org.apache.tools.ant.DefaultLogger")
+  Main = Rjb::import("org.apache.tools.ant.Main")
+  Project = Rjb::import("org.apache.tools.ant.Project")
+  RuntimeConfigurable = Rjb::import("org.apache.tools.ant.RuntimeConfigurable")
+  Target = Rjb::import("org.apache.tools.ant.Target")
+  UnknownElement = Rjb::import("org.apache.tools.ant.UnknownElement")
+end
+
+module JavaLang
+  require 'rubygems'
+  require 'rjb'
+  System = Rjb::import("java.lang.System")
+end

data/test/tc_antwrap.rb

@@ -6,40 +6,37 @@
 #
 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
-
+$LOAD_PATH.push(ENV['PWD'] + '/lib')
+require 'antwrap'
+require 'logger'
+#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
   
   def setup
-    #   ENV is broken as of JRuby 0.9.2 but patched in 0.9.3 (see: http://jira.codehaus.org/browse/JRUBY-349)
-    #   @output_dir = ENV['PWD'] + '/output'
-    #   @resource_dir = ENV['PWD'] + '/test-resources'
-    #   The following is a workaround
-    @current_dir = Java::java.lang.System.getProperty("user.dir")
+    @current_dir = ENV['PWD']
     @ant_proj_props = {:name=>"testProject", :basedir=>@current_dir, :declarative=>true, 
                         :logger=>Logger.new(STDOUT), :loglevel=>Logger::DEBUG}
     @ant = AntProject.new(@ant_proj_props)
     assert(@ant_proj_props[:name] == @ant.name())
+    
     assert(@ant_proj_props[:basedir] == @ant.basedir())
     assert(@ant_proj_props[:declarative] == @ant.declarative())
     
@@ -106,11 +103,11 @@ class TestAntwrap < Test::Unit::TestCase
     assert_absent @output_dir + '/classes/foo/bar/FooBar.class'
     @ant.property(:name => 'pattern', :value => '**/*.jar') 
     @ant.property(:name => 'resource_dir', :value => @resource_dir)
-    @ant.path(:id => 'common.class.path'){
-      fileset(:dir => '${resource_dir}'){
-        include(:name => '${pattern}')
+      @ant.path(:id => 'common.class.path'){
+        fileset(:dir => '${resource_dir}'){
+          include(:name => '${pattern}')
+        }
       }
-    }
     
     @ant.javac(:srcdir => @resource_dir + '/src', 
     :destdir => @output_dir + '/classes',

metadata

@@ -3,10 +3,10 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: Antwrap
 version: !ruby/object:Gem::Version 
-  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."
+  version: 0.5.0
+date: 2007-03-15
+summary: "A Ruby module that wraps the Apache Ant build tool, enabling Ant Tasks to be
+  invoked from a Ruby/JRuby scripts."
 require_paths: 
   - lib
 email: caleb.powell@gmail.com
@@ -16,7 +16,7 @@ description:
 autorequire: antwrap
 default_executable: 
 bindir: bin
-has_rdoc: false
+has_rdoc: true
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
     - 
@@ -29,8 +29,8 @@ authors:
   - Caleb Powell
 files: 
   - lib/antwrap.rb
-  - lib/convert.rb
-  - lib/rakefile.rb
+  - lib/jruby_modules.rb
+  - lib/rjb_modules.rb
   - test/output
   - test/tc_antwrap.rb
   - test/tc_convert.rb
@@ -64,4 +64,14 @@ extra_rdoc_files:
 executables: []
 extensions: []
 requirements: []
-dependencies: []
+dependencies: 
+  - !ruby/object:Gem::Dependency 
+    name: rjb
+    version_requirement: 
+    version_requirements: !ruby/object:Gem::Version::Requirement 
+      requirements: 
+        - 
+          - ">="
+          - !ruby/object:Gem::Version 
+            version: 1.0.3
+      version: 

data/lib/convert.rb

@@ -1,104 +0,0 @@
-# antwrap
-#
-# Copyright Caleb Powell 2007
-#
-# Licensed under the LGPL, see the file COPYING in the distribution
-#
-require 'rexml/document'
- 
-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', 'java']
-
-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
-  return str
-end
-
-
-@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)
-  @rakefile.print "#{tab}#{prefix}#{task_name}("
-  
-  if(task_name == 'macrodef')
-    task.attributes['name'] = rubyize(task.attributes['name'])
-  elsif(task_name == 'java')
-    task_name = 'jvm'
-  end
-  
-  isFirst = true;
-  task.attributes.each do |key, value|
-    if !isFirst 
-      @rakefile.print(",\n#{tab+@one_tab}")
-    end
-    @rakefile.print ":#{key} => \"#{value}\""
-    isFirst = false;
-  end
-  
-  if task.has_text?
-    pcdata = task.texts().join
-    if(pcdata.strip() != '')
-      @rakefile.print ":pcdata => \"#{pcdata}\""  
-    end
-  end
-  @rakefile.print ")"
-  
-  
-  if task.elements.size > 0 
-    @rakefile.print "{"
-    task.elements.each do |child|
-      @rakefile.print "\n"
-      print_task(child, (tab+@one_tab), '')
-    end
-    @rakefile.print "\n#{tab}}"
-  end
-end
-
-xml.elements.each("/project/*") do |node|
-  if node.name != 'target'
-    print_task(node, '', '@ant.')
-    @rakefile.print "\n\n"
-  end
-end
-
-xml.elements.each("/project/target") do |node|
-  
-    task = "\ntask " + create_symbol(node.attributes['name']) + 
-         " => [" + create_symbol(node.attributes['depends']) + "] do\n"
-    
-    @rakefile.print task
-    
-    node.elements.each do |child|
-      print_task(child, @one_tab, '@ant.')
-      @rakefile.print "\n"
-    end
-    @rakefile.print "end\n"
-end
-

data/lib/rakefile.rb

@@ -1,101 +0,0 @@
-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