atoulme-Antwrap 0.7.2 → 0.7.3

data/Rakefile

@@ -22,23 +22,24 @@ def apply_default_hoe_properties(hoe)
   hoe.rubyforge_name = 'antwrap'
   hoe.author = 'Caleb Powell'
   hoe.email = 'caleb.powell@gmail.com'
-  hoe.url = 'http://rubyforge.org/projects/antwrap/'
+  hoe.urls = ['http://rubyforge.org/projects/antwrap/']
   hoe.summary = 'A Ruby module that wraps the Apache Ant build tool. Antwrap can be used to invoke Ant Tasks from a Ruby or a JRuby script.'
   hoe.description = hoe.paragraphs_of('README.txt', 2..5).join("\n\n")
   hoe.changes = hoe.paragraphs_of('History.txt', 0..1).join("\n\n")
+  hoe.version = Antwrap::VERSION
   puts "Current changes in this release_______________ "
   puts "#{hoe.changes}"
   puts "----------------------------------------------"
 end
 
 #builds the MRI Gem
-Hoe.new('atoulme-Antwrap', Antwrap::VERSION) do |hoe|
+Hoe.spec('atoulme-Antwrap') do |hoe|
   apply_default_hoe_properties hoe
   hoe.extra_deps << ["rjb", ">= 1.0.3"]
 end
 
 #builds the JRuby Gem
-Hoe.new('atoulme-Antwrap', Antwrap::VERSION) do |hoe|
+Hoe.spec('atoulme-Antwrap') do |hoe|
   apply_default_hoe_properties hoe
   hoe.spec_extras = {:platform => 'java'}
 end
@@ -46,4 +47,4 @@ end
 Rake::TestTask.new('test') do |t|
   t.ruby_opts = ['-r test/load_devcreek.rb']
   t.test_files = ['test/*test.rb']
-end
+end

data/lib/ant_project.rb

@@ -117,7 +117,7 @@ module Antwrap
         end
         
       rescue
-        @logger.error("Error instantiating '#{sym.to_s}' task: " + $!)
+        @logger.error("Error instantiating '#{sym.to_s}' task: " + $!.to_s)
         raise
       ensure
         @task_stack.pop

data/lib/antwrap.rb

@@ -18,5 +18,5 @@ module Antwrap
   autoload :ApacheAnt, 'ant_libraries.rb'
   autoload :JavaLang, 'ant_libraries.rb'
   autoload :XmlOrg, 'ant_libraries.rb'
-  VERSION = "0.7.2"
+  VERSION = "0.7.3"
 end

data/test/antwrap_test.rb

@@ -0,0 +1,262 @@
+# Copyright 2008 Caleb Powell 
+# Licensed under the Apache License, Version 2.0 (the "License"); 
+# you may not use this file except in compliance with the License. 
+# You may obtain a copy of the License at 
+#
+#   http://www.apache.org/licenses/LICENSE-2.0 
+# 
+# Unless required by applicable law or agreed to in writing, software 
+# distributed under the License is distributed on an "AS IS" BASIS, 
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+# See the License for the specific language governing permissions and limitations 
+# under the License.
+
+require 'test/unit'
+require 'fileutils'
+$LOAD_PATH.push(FileUtils::pwd + '/lib')
+require 'antwrap'
+require 'logger'
+
+class AntwrapTest < Test::Unit::TestCase
+  
+  def setup
+    @output_dir = FileUtils::pwd + File::SEPARATOR + 'test' + File::SEPARATOR + 'output'
+    @resource_dir = FileUtils::pwd  + File::SEPARATOR + 'test' + File::SEPARATOR + 'test-resources'
+    
+    @ant_home = @resource_dir  + File::SEPARATOR + "apache-ant-1.7.0"
+#    @ant_home = "/Users/caleb/tools/apache-ant-1.6.5"
+#    @ant_home = "/Users/caleb/tools/apache-ant-1.5.4"
+    @ant_proj_props = {:name=>"testProject", :basedir=>FileUtils::pwd, :declarative=>true, 
+                        :logger=>Logger.new(STDOUT), :loglevel=>Logger::DEBUG, :ant_home => @ant_home}
+    @ant = Antwrap::AntProject.new(@ant_proj_props)
+    
+    if File.exists?(@output_dir)
+      FileUtils.remove_dir(@output_dir)
+    end
+    FileUtils.mkdir(@output_dir, :mode => 0775)
+  end
+  
+  def test_antproject_init
+    @ant_proj_props = {:name=>"testProject", :declarative=>true, 
+                        :logger=>Logger.new(STDOUT), :loglevel=>Logger::ERROR}
+    ant_proj = Antwrap::AntProject.new(@ant_proj_props)
+    assert(@ant_proj_props[:name] == ant_proj.name())
+#    assert(FileUtils::pwd == ant_proj.basedir())
+    assert(@ant_proj_props[:declarative] == ant_proj.declarative())
+    assert(@ant_proj_props[:logger] == ant_proj.logger())
+  end
+      
+  def test_unzip_task
+    assert_absent @output_dir + '/parent/FooBarParent.class'
+    @ant.unzip(:src => @resource_dir + '/parent.jar', :dest => @output_dir)
+    assert_exists @output_dir + '/parent/FooBarParent.class'
+  end
+  
+  def test_copyanddelete_task
+    file = @output_dir + '/foo.txt'
+    assert_absent file
+    @ant.copy(:file => @resource_dir + '/foo.txt', 
+    :todir => @output_dir)
+    assert_exists file
+    
+    @ant.delete(:file => file)
+    assert_absent file
+  end
+  
+  def test_javac_task
+    FileUtils.mkdir(@output_dir + '/classes', :mode => 0775)
+    
+    assert_absent @output_dir + '/classes/foo/bar/FooBar.class'
+    
+    @ant.javac(:srcdir => @resource_dir + '/src', 
+    :destdir => @output_dir + '/classes',
+    :debug => 'on',
+    :verbose => 'no',
+    :fork => 'no',
+    :failonerror => 'yes',
+    :includes => 'foo/bar/**',
+    :excludes => 'foo/bar/baz/**',
+    :classpath => @resource_dir + '/parent.jar')
+    
+    assert_exists @output_dir + '/classes/foo/bar/FooBar.class'
+    assert_absent @output_dir + '/classes/foo/bar/baz/FooBarBaz.class'
+  end
+  
+  def test_javac_task_with_property
+    FileUtils.mkdir(@output_dir + '/classes', :mode => 0775)
+    
+    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'){
+      @ant.fileset(:dir => '${resource_dir}'){
+        @ant.include(:name => '${pattern}')
+      }
+    }
+    puts "Resource dir: #{@resource_dir}"
+    @ant.javac(:srcdir => @resource_dir + '/src', 
+    :destdir => @output_dir + '/classes',
+    :debug => true,
+    :verbose => true,
+    :fork => 'no',
+    :failonerror => 'blahblahblah',
+    :includes => 'foo/bar/**',
+    :excludes => 'foo/bar/baz/**',
+    :classpathref => 'common.class.path')
+    
+    assert_exists @output_dir + '/classes/foo/bar/FooBar.class'
+    assert_absent @output_dir + '/classes/foo/bar/baz/FooBarBaz.class'
+  end
+  
+  def test_jar_task
+    assert_absent @output_dir + '/Foo.jar'
+    @ant.property(:name => 'outputdir', :value => @output_dir)
+    @ant.property(:name => 'destfile', :value => '${outputdir}/Foo.jar') 
+    @ant.jar( :destfile => "${destfile}", 
+    :basedir => @resource_dir + '/src',
+    :duplicate => 'preserve')
+    
+    assert_exists @output_dir + '/Foo.jar'
+  end
+  
+  def test_java_task
+  
+    return if @ant.ant_version < 1.7
+    puts "executing java task" 
+    FileUtils.mkdir(@output_dir + '/classes', :mode => 0775)
+    @ant.javac(:srcdir => @resource_dir + '/src',  
+    :destdir => @output_dir + '/classes',
+    :debug => 'on',
+    :verbose => 'no',
+    :fork => 'no',
+    :failonerror => 'yes',
+    :includes => 'foo/bar/**',
+    :excludes => 'foo/bar/baz/**',
+    :classpath => @resource_dir + '/parent.jar')
+    
+    @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|
+      ant.arg(:value => 'argOne')
+      ant.classpath(){
+        ant.pathelement(:location => '${output_dir}/classes')
+        ant.pathelement(:location => '${resource_dir}/parent.jar')
+      }
+      ant.arg(:value => 'argTwo')
+      ant.jvmarg(:value => 'client')
+      ant.sysproperty(:key=> 'antwrap', :value => 'coolio')
+    }
+  end
+  
+  def test_echo_task
+    msg = "Antwrap is running an Echo task"                    
+    @ant.echo(:message => msg, :level => 'info')
+    @ant.echo(:message => 100000, :level => 'info')
+    @ant.echo(:pcdata => 1000)
+  end
+  
+  def test_mkdir_task
+    dir = @output_dir + '/foo'
+    
+    assert_absent dir
+    
+    @ant.mkdir(:dir => dir)
+    
+    assert_exists dir
+  end 
+  
+  def test_mkdir_task_with_property
+    dir = @output_dir + '/foo'
+    
+    assert_absent dir
+    
+    @ant.property(:name => 'outputProperty', :value => dir)
+    @ant.mkdir(:dir => "${outputProperty}")
+    
+    assert_exists dir
+  end 
+  
+  def test_macrodef_task
+    
+    return if @ant.ant_version < 1.6
+    
+    dir = @output_dir + '/foo'
+    
+    assert_absent dir
+    
+    @ant.macrodef(:name => 'testmacrodef'){|ant|
+      ant.attribute(:name => 'destination')
+      ant.sequential(){
+        ant.echo(:message => "Creating @{destination}")
+        ant._mkdir(:dir => "@{destination}")
+      }
+    }      
+    @ant.testmacrodef(:destination => dir)
+    assert_exists dir
+  end
+  
+  def test_cdata
+    @ant.echo(:pcdata => "Foobar &amp; <><><>")
+  end
+  
+  def test_ant_contrib
+
+    return if @ant.ant_version() < 1.6
+
+    @ant.taskdef(:resource => "net/sf/antcontrib/antlib.xml")
+
+    @ant.property(:name => "bar", :value => "bar")
+    @ant._if(){|ant|
+      ant._equals(:arg1 => "${bar}", :arg2 => "bar")
+      ant._then(){
+        ant.echo(:message => "if 1 is equal")
+      }
+      ant._else(){
+        ant.echo(:message => "if 1 is not equal")
+      }
+    }
+
+    @ant.property(:name => "baz", :value => "foo")
+    @ant._if(){|ant|
+      ant._equals(:arg1 => "${baz}", :arg2 => "bar")
+      ant._then(){
+        ant.echo(:message => "if 2 is equal")
+      }
+      ant._else(){
+        ant.echo(:message => "if 2 is not equal")
+      }
+    }
+
+  end
+  
+  def test_tstamp
+    @ant.tstamp
+  end
+  
+  def test_array_argument
+    begin
+      @ant.echo(:message => ['This', 'should', 'fail', 'because', 'Arrays', 'are', 'not', 'supported'])
+      add_failure "Arrays not permitted"
+    rescue ArgumentError
+    end
+  end
+  
+  def test_declarative
+    @ant = Antwrap::AntProject.new({:declarative=>false,:loglevel=>Logger::DEBUG, :ant_home => @ant_home})
+    echo = @ant.echo(:message => "Echo")
+    assert_not_nil(echo)
+
+    @ant = Antwrap::AntProject.new({:declarative=>true,:loglevel=>Logger::DEBUG, :ant_home => @ant_home})
+    echo = @ant.echo(:message => "Echo")
+    assert_nil(echo)
+  end
+    
+  private 
+  def assert_exists(file_path)
+    assert(File.exists?(file_path), "Does not exist[#{file_path}]")
+  end
+  
+  def assert_absent(file_path)
+    assert(!File.exists?(file_path), "Should not exist[#{file_path}]")
+  end
+end

data/test/javaadapter_spec.rb

@@ -0,0 +1,24 @@
+# testresult_spec.rb
+#
+# Copyright Caleb Powell 2007
+#
+# Licensed under the LGPL, see the file README.txt in the distribution
+require 'fileutils'
+$LOAD_PATH.push(FileUtils::pwd + '/lib')
+require 'java_adapter.rb'
+
+describe Antwrap::JavaAdapter do
+
+  it "should extract the Java class name from a string" do
+    Antwrap::JavaAdapter.extract_class_name("java.lang.String").should eql("String")
+    Antwrap::JavaAdapter.extract_class_name("Foo").should eql("Foo")
+    Antwrap::JavaAdapter.extract_class_name("java.lang.__String").should eql("__String")
+    Antwrap::JavaAdapter.extract_class_name("java.lang.Outer$Inner").should eql("Outer$Inner")
+  end
+
+  it "should import a class" do
+    result = Antwrap::JavaAdapter.import_class("java.lang.String")
+    result.should_not be_nil
+    result.should respond_to(:new)
+  end
+end

metadata

@@ -1,58 +1,82 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: atoulme-Antwrap
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.7.3
   prerelease: 
-  version: 0.7.2
 platform: ruby
-authors: 
+authors:
 - Caleb Powell
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-06 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-11-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rjb
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.3
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.3
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.3.3
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
   type: :development
-  version_requirements: *id002
-description: "\tA Ruby module that wraps the Apache Ant build tool. Antwrap can be used to invoke Ant Tasks from a Ruby or a JRuby script.\n\n\
-  == FEATURES/PROBLEMS:\n\n\
-  \tAntwrap runs on the native Ruby interpreter via the RJB (Ruby Java Bridge gem) and on the JRuby interpreter. Antwrap is compatible with Ant versions 1.5.4, \n\
-  \t1.6.5 and 1.7.0. For more information, \tsee the Project Info (http://rubyforge.org/projects/antwrap/) page. \n\
-  \t \n\
-  == SYNOPSIS:\n\n\
-  \tAntwrap is a Ruby library that can be used to invoke Ant tasks. It is being used in the Buildr (http://incubator.apache.org/buildr/) project to execute \n\
-  \tAnt (http://ant.apache.org/) tasks in a Java project. If you are tired of fighting with Ant or Maven XML files in your Java project, take some time to \n\
-  \tcheck out Buildr!"
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.2'
+description: ! "\tA Ruby module that wraps the Apache Ant build tool. Antwrap can
+  be used to invoke Ant Tasks from a Ruby or a JRuby script.\n\n== FEATURES/PROBLEMS:\n\n\tAntwrap
+  runs on the native Ruby interpreter via the RJB (Ruby Java Bridge gem) and on the
+  JRuby interpreter. Antwrap is compatible with Ant versions 1.5.4, \n\t1.6.5 and
+  1.7.0. For more information, \tsee the Project Info (http://rubyforge.org/projects/antwrap/)
+  page. \n\t \n== SYNOPSIS:\n\n\tAntwrap is a Ruby library that can be used to invoke
+  Ant tasks. It is being used in the Buildr (http://incubator.apache.org/buildr/)
+  project to execute \n\tAnt (http://ant.apache.org/) tasks in a Java project. If
+  you are tired of fighting with Ant or Maven XML files in your Java project, take
+  some time to \n\tcheck out Buildr!"
 email: caleb.powell@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - History.txt
 - Manifest.txt
 - README.txt
-files: 
+files:
 - History.txt
 - LICENSE
 - Manifest.txt
@@ -69,33 +93,36 @@ files:
 - lib/antwrap_utilities.rb
 - lib/ant_libraries.rb
 - lib/java_adapter.rb
+- test/antwrap_test.rb
+- test/javaadapter_spec.rb
+- .gemtest
 homepage: http://rubyforge.org/projects/antwrap/
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.txt
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: antwrap
-rubygems_version: 1.8.5
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: A Ruby module that wraps the Apache Ant build tool. Antwrap can be used to invoke Ant Tasks from a Ruby or a JRuby script.
-test_files: []
-
+summary: A Ruby module that wraps the Apache Ant build tool. Antwrap can be used to
+  invoke Ant Tasks from a Ruby or a JRuby script.
+test_files:
+- test/antwrap_test.rb
+- test/javaadapter_spec.rb