maven-tools 1.0.0.rc2 → 1.0.0.rc3

data/lib/maven/tools/pom.rb

@@ -19,7 +19,6 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 require 'fileutils'
-require 'java' if defined? JRUBY_VERSION
 require 'stringio'
 require 'maven/tools/model'
 require 'maven/tools/dsl'
@@ -31,9 +30,9 @@ module Maven
     class POM
       include Maven::Tools::DSL
 
-      def eval_spec( s )
+      def eval_spec( s, snapshot )
         @model = tesla do
-          spec s
+          spec s, nil, :snapshot => snapshot, :no_rubygems_repo => true
         end
       end
 
@@ -60,9 +59,9 @@ module Maven
         end
       end
 
-      def initialize( file = nil )
+      def initialize( file = nil, snapshot = false )
         if file.is_a? Gem::Specification
-          eval_spec( file )
+          eval_spec( file, snapshot )
         else
           eval_file( file )
         end

data/lib/maven/tools/version.rb

@@ -20,6 +20,6 @@
 #
 module Maven
   module Tools
-    VERSION = '1.0.0.rc2'.freeze
+    VERSION = '1.0.0.rc3'.freeze
   end
 end

data/lib/maven/tools/versions.rb

@@ -22,15 +22,12 @@ module Maven
   module Tools
     unless defined? VERSIONS
       VERSIONS = { 
-        :jruby_rack => "1.1.13.2",
-        :assembly_plugin => "2.4",
-        :war_plugin => "2.2",
         :jar_plugin => "2.4",
         :clean_plugin => "2.4",
-        :jruby_plugins => "1.0.0-rc4",
-        :bundler_version => "1.3.5",
-        :jruby_version => "1.7.6",
-        :tesla_version => "0.0.8"
+        :jruby_plugins => "1.0.1",
+        :bundler_version => "1.6.2",
+        :jruby_version => "1.7.12",
+        :tesla_version => "0.1.0"
       }.freeze
     end
   end

data/lib/maven/tools/visitor.rb

@@ -22,7 +22,8 @@ module Maven
         @io.print "#{indent}<#{name}"
         attr.each do |k,v|
           @io.puts
-          @io.print "#{indent}  #{k.to_s[1..-1]}='#{v}'"
+          vv = v.gsub( /"/, '&quot;' )
+          @io.print "#{indent}  #{k.to_s[1..-1]}=\"#{vv}\""
         end
         @io.puts ">"
         inc
@@ -42,15 +43,19 @@ module Maven
       end
 
       def tag( name, value )
-        unless value.nil?
-          name = camel_case_lower( name )
-          @io.puts "#{indent}<#{name}>#{value}</#{name}>"
+        if value != nil
+          if value.respond_to? :to_xml
+            @io.puts "#{indent}#{value.to_xml}"
+          else
+            name = camel_case_lower( name )
+            @io.puts "#{indent}<#{name}>#{escape_value( value )}</#{name}>"
+          end
         end
       end
 
       def raw_tag( name, value )
         unless value.nil?
-          @io.puts "#{indent}<#{name}>#{value}</#{name}>"
+          @io.puts "#{indent}<#{name}>#{escape_value( value )}</#{name}>"
         end
       end
 
@@ -119,7 +124,6 @@ module Maven
 
       def accept_hash( name, hash )
         unless hash.empty?
-          # TODO attributes
           attr = hash.select do |k, v|
             [ k, v ] if k.to_s.match( /^@/ )
           end
@@ -128,14 +132,25 @@ module Maven
             case v
             when Array
               accept_array( k, v )
+            when Hash
+              accept_hash( k, v )
             else
-              # TODO xml content
               tag( k, v ) unless k.to_s.match( /^@/ )
             end
           end
           end_tag( name )
         end
       end
+      
+      def escape_value( value )
+        value = value.to_s
+        value.gsub!( /&/, '&amp;' )
+        # undo double quote, somehow xyz.gemspec.rz have encoded values
+        value.gsub!( /&amp;(amp|lt|gt);/, '&\1;' )
+        value.gsub!( /</, '&lt;' )
+        value.gsub!( />/, '&gt;' )
+        value
+      end
 
       def visit( model )
         model.attributes.each do |k, v|

data/maven-tools.gemspec

@@ -0,0 +1,39 @@
+# -*- mode:ruby -*-
+# -*- coding: utf-8 -*-
+require File.expand_path('lib/maven/tools/version.rb')
+Gem::Specification.new do |s|
+  s.name = 'maven-tools'
+  s.version = Maven::Tools::VERSION.dup
+
+  s.summary = 'helpers for maven related tasks'
+  s.description = 'adds versions conversion from rubygems to maven and vice versa, ruby DSL for POM (Project Object Model from maven), pom generators, etc'
+  s.homepage = 'http://github.com/torquebox/maven-tools'
+
+  s.authors = ['Christian Meier']
+  s.email = ['m.kristian@web.de']
+
+  s.license = 'MIT'
+
+  s.files += Dir['*.gemspec']
+  s.files += Dir['*file']
+  s.files += Dir['lib/**/*rb']
+  s.files += Dir['spec/**/*rb']
+  s.files += Dir['MIT-LICENSE'] + Dir['*.md']
+  s.test_files += Dir['spec/**/*.rb']
+  s.test_files += Dir['spec/**/*.java']
+  s.test_files += Dir['spec/**/*.xml']
+  s.test_files += Dir['spec/**/*file']
+  s.test_files += Dir['spec/**/Gemfile.lock']
+  s.test_files += Dir['spec/**/.keep']
+  s.test_files += Dir['spec/**/*gemspec']
+  s.test_files += Dir['spec/**/*gem']
+
+  s.add_runtime_dependency 'virtus', '~> 1.0'
+
+# get them out from here until jruby-maven-plugin installs test gems somewhere else then runtime gems
+
+  s.add_development_dependency 'rake', '~> 10.0'
+  s.add_development_dependency 'minitest', '~> 5.3'
+end
+
+# vim: syntax=Ruby

data/spec/artifact_spec.rb

@@ -30,15 +30,35 @@ describe Maven::Tools::Artifact do
   end
 
   it 'should convert ruby version contraints - jars' do
-    Maven::Tools::Artifact.from( :jar, 'rubygems:asd', '=1' ).to_s.must_equal 'rubygems:asd:jar:[1,1.0.0.0.0.1)'
-    Maven::Tools::Artifact.from( :jar, 'rubygems:asd', '>=1' ).to_s.must_equal 'rubygems:asd:jar:[1,)'
-    Maven::Tools::Artifact.from( :jar, 'rubygems:asd', '<=1' ).to_s.must_equal 'rubygems:asd:jar:[0,1]'
-    Maven::Tools::Artifact.from( :jar, 'rubygems:asd', '>1' ).to_s.must_equal 'rubygems:asd:jar:(1,)'
-    Maven::Tools::Artifact.from( :jar, 'rubygems:asd', '<1' ).to_s.must_equal 'rubygems:asd:jar:[0,1)'
-    Maven::Tools::Artifact.from( :jar, 'rubygems:asd', '!1' ).to_s.must_equal 'rubygems:asd:jar:(1,)'
-    Maven::Tools::Artifact.from( :jar, 'rubygems:asd', '<2', '>1' ).to_s.must_equal 'rubygems:asd:jar:(1,2)'
-    Maven::Tools::Artifact.from( :jar, 'rubygems:asd', '<=2', '>1' ).to_s.must_equal 'rubygems:asd:jar:(1,2]'
-    Maven::Tools::Artifact.from( :jar, 'rubygems:asd', '<2', '>=1' ).to_s.must_equal 'rubygems:asd:jar:[1,2)'
-    Maven::Tools::Artifact.from( :jar, 'rubygems:asd', '<=2', '>=1' ).to_s.must_equal 'rubygems:asd:jar:[1,2]'
+    Maven::Tools::Artifact.from( :jar, 'org.something:asd', '=1' ).to_s.must_equal 'org.something:asd:jar:[1,1.0.0.0.0.1)'
+    Maven::Tools::Artifact.from( :jar, 'org.something:asd', '>=1' ).to_s.must_equal 'org.something:asd:jar:[1,)'
+    Maven::Tools::Artifact.from( :jar, 'org.something:asd', '<=1' ).to_s.must_equal 'org.something:asd:jar:[0,1]'
+    Maven::Tools::Artifact.from( :jar, 'org.something:asd', '>1' ).to_s.must_equal 'org.something:asd:jar:(1,)'
+    Maven::Tools::Artifact.from( :jar, 'org.something:asd', '<1' ).to_s.must_equal 'org.something:asd:jar:[0,1)'
+    Maven::Tools::Artifact.from( :jar, 'org.something:asd', '!1' ).to_s.must_equal 'org.something:asd:jar:(1,)'
+    Maven::Tools::Artifact.from( :jar, 'org.something:asd', '<2', '>1' ).to_s.must_equal 'org.something:asd:jar:(1,2)'
+    Maven::Tools::Artifact.from( :jar, 'org.something:asd', '<=2', '>1' ).to_s.must_equal 'org.something:asd:jar:(1,2]'
+    Maven::Tools::Artifact.from( :jar, 'org.something:asd', '<2', '>=1' ).to_s.must_equal 'org.something:asd:jar:[1,2)'
+    Maven::Tools::Artifact.from( :jar, 'org.something:asd', '<=2', '>=1' ).to_s.must_equal 'org.something:asd:jar:[1,2]'
+  end  
+
+  it 'passes in scope to artifact' do
+    a = Maven::Tools::Artifact.from( :jar, 'org.something:asd', '1' )
+    a.to_s.must_equal 'org.something:asd:jar:1'
+    a[ :scope ].must_be_nil
+    a = Maven::Tools::Artifact.from( :jar, 'org.something:asd', '1', :scope => :provided )
+    a.to_s.must_equal 'org.something:asd:jar:1'
+    a[ :scope ].must_equal :provided
+  end
+  it 'passes in exclusions to artifact' do
+    a = Maven::Tools::Artifact.from( :jar, 'org.something:asd', '1' )
+    a.to_s.must_equal 'org.something:asd:jar:1'
+    a[ :exclusions ].must_be_nil
+    a = Maven::Tools::Artifact.from( :jar, 'org.something:asd', '1', :exclusions => ["org.something:dsa"] )
+    a.to_s.must_equal 'org.something:asd:jar:1:[org.something:dsa]'
+    a[ :exclusions ].must_equal [ 'org.something:dsa' ]
+    a = Maven::Tools::Artifact.from( :jar, 'org.something:asd', '1', :exclusions => ["org.something:dsa", "org.anything:qwe"] )
+    a.to_s.must_equal 'org.something:asd:jar:1:[org.something:dsa,org.anything:qwe]'
+    a[ :exclusions ].must_equal [ 'org.something:dsa', 'org.anything:qwe' ]
   end
 end

data/spec/coordinate_spec.rb

@@ -13,7 +13,7 @@ describe Maven::Tools::Coordinate do
     subject.to_version('!2.3.4').must_equal "(2.3.4,)"
     subject.to_version('!2.3.4.rc').must_equal "(2.3.4.rc-SNAPSHOT,)"
     subject.to_version('=2.3.4').must_equal "[2.3.4,2.3.4.0.0.0.0.1)"
-    subject.to_version('=2.3.4.alpha').must_equal "[2.3.4.alpha-SNAPSHOT,2.3.4.alpha.0.0.0.0.1)"
+    subject.to_version('=2.3.4.alpha').must_equal "2.3.4.alpha"
     subject.to_version('~>1.8.2').must_equal "[1.8.2,1.8.99999]"
     subject.to_version('~>1.8.2.beta').must_equal "[1.8.2.beta-SNAPSHOT,1.8.99999]"
     subject.to_version('~>1.8.2.beta123.12').must_equal "[1.8.2.beta123.12-SNAPSHOT,1.8.99999]"

data/spec/gemfile/Gemfile

@@ -0,0 +1,7 @@
+#-*- mode: ruby -*-
+
+gemspec
+
+gem 'virtus', :require => false
+
+# vim: syntax=Ruby

data/spec/gemfile/Mavenfile

@@ -0,0 +1,5 @@
+#-*- mode: ruby -*-
+
+gemfile
+
+# vim: syntax=Ruby

data/spec/gemfile/bouncy-castle-java.gemspec

@@ -0,0 +1,20 @@
+#-*- mode: ruby -*-
+
+require './bouncy-castle-version.rb'
+
+Gem::Specification.new do |s|
+  s.name = 'bouncy-castle-java'
+  s.version = "1.5.0#{BouncyCastle::VERSION_}"
+  s.author = 'Hiroshi Nakamura'
+  s.email = [ 'nahi@ruby-lang.org' ]
+  s.rubyforge_project = "jruby-extras"
+  s.homepage = 'http://github.com/jruby/jruby/tree/master/gems/bouncy-castle-java/'
+  s.summary = 'Gem redistribution of Bouncy Castle jars'
+  s.description = 'Gem redistribution of "Legion of the Bouncy Castle Java cryptography APIs" jars at http://www.bouncycastle.org/java.html'
+  s.platform = 'java'
+  s.files = ['README', 'LICENSE.html', 'lib/bouncy-castle-java.rb' ] + Dir['lib/bc*.jar' ]
+  s.requirements << "jar org.bouncycastle:bcpkix-jdk15on, #{BouncyCastle::MAVEN_VERSION}"
+  s.requirements << "jar org.bouncycastle:bcprov-jdk15on, #{BouncyCastle::MAVEN_VERSION}"
+end
+
+# vim: syntax=Ruby

data/spec/gemfile/pom.xml

@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2012 to original author or authors
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v1.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v10.html
+
+-->
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>rubygems</groupId>
+  <artifactId>bouncy-castle-java</artifactId>
+  <version>1.5.0149</version>
+  <packaging>gem</packaging>
+  <name>Gem redistribution of Bouncy Castle jars</name>
+  <url>http://github.com/jruby/jruby/tree/master/gems/bouncy-castle-java/</url>
+  <description>Gem redistribution of "Legion of the Bouncy Castle Java cryptography APIs" jars at http://www.bouncycastle.org/java.html</description>
+  <developers>
+    <developer>
+      <name>Hiroshi Nakamura</name>
+      <email>nahi@ruby-lang.org</email>
+    </developer>
+  </developers>
+  <scm>
+    <connection>https://github.com/jruby/jruby/tree/master/gems/bouncy-castle-java.git</connection>
+    <url>http://github.com/jruby/jruby/tree/master/gems/bouncy-castle-java/</url>
+  </scm>
+  <properties>
+    <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
+    <jruby.plugins.version>1.0.1</jruby.plugins.version>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>rubygems</groupId>
+      <artifactId>virtus</artifactId>
+      <version>[0,)</version>
+      <type>gem</type>
+    </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcpkix-jdk15on</artifactId>
+      <version>1.49</version>
+    </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcprov-jdk15on</artifactId>
+      <version>1.49</version>
+    </dependency>
+  </dependencies>
+  <repositories>
+    <repository>
+      <id>rubygems-releases</id>
+      <url>http://rubygems-proxy.torquebox.org/releases</url>
+    </repository>
+  </repositories>
+  <build>
+    <extensions>
+      <extension>
+        <groupId>de.saumya.mojo</groupId>
+        <artifactId>gem-extension</artifactId>
+        <version>${jruby.plugins.version}</version>
+      </extension>
+    </extensions>
+    <directory>${basedir}/pkg</directory>
+    <plugins>
+      <plugin>
+        <groupId>de.saumya.mojo</groupId>
+        <artifactId>gem-maven-plugin</artifactId>
+        <version>${jruby.plugins.version}</version>
+        <configuration>
+          <gemspec>bouncy-castle-java.gemspec</gemspec>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>

data/spec/gemfile_include_jars/Gemfile

@@ -0,0 +1,5 @@
+#-*- mode: ruby -*-
+
+gemspec
+
+# vim: syntax=Ruby

data/spec/gemfile_include_jars/Mavenfile

@@ -0,0 +1,5 @@
+#-*- mode: ruby -*-
+
+gemfile :include_jars => true
+
+# vim: syntax=Ruby

data/spec/gemfile_include_jars/bouncy-castle-java.gemspec

@@ -0,0 +1,20 @@
+#-*- mode: ruby -*-
+
+require './bouncy-castle-version.rb'
+
+Gem::Specification.new do |s|
+  s.name = 'bouncy-castle-java'
+  s.version = "1.5.0#{BouncyCastle::VERSION_}"
+  s.author = 'Hiroshi Nakamura'
+  s.email = [ 'nahi@ruby-lang.org' ]
+  s.rubyforge_project = "jruby-extras"
+  s.homepage = 'http://github.com/jruby/jruby/tree/master/gems/bouncy-castle-java/'
+  s.summary = 'Gem redistribution of Bouncy Castle jars'
+  s.description = 'Gem redistribution of "Legion of the Bouncy Castle Java cryptography APIs" jars at http://www.bouncycastle.org/java.html'
+  s.platform = 'java'
+  s.files = ['README', 'LICENSE.html', 'lib/bouncy-castle-java.rb' ] + Dir['lib/bc*.jar' ]
+  s.requirements << "jar org.bouncycastle:bcpkix-jdk15on, #{BouncyCastle::MAVEN_VERSION}"
+  s.requirements << "jar org.bouncycastle:bcprov-jdk15on, #{BouncyCastle::MAVEN_VERSION}"
+end
+
+# vim: syntax=Ruby

data/spec/gemfile_include_jars/pom.xml

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 2012 to original author or authors
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v1.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v10.html
+
+-->
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>rubygems</groupId>
+  <artifactId>bouncy-castle-java</artifactId>
+  <version>1.5.0149</version>
+  <packaging>gem</packaging>
+  <name>Gem redistribution of Bouncy Castle jars</name>
+  <url>http://github.com/jruby/jruby/tree/master/gems/bouncy-castle-java/</url>
+  <description>Gem redistribution of "Legion of the Bouncy Castle Java cryptography APIs" jars at http://www.bouncycastle.org/java.html</description>
+  <developers>
+    <developer>
+      <name>Hiroshi Nakamura</name>
+      <email>nahi@ruby-lang.org</email>
+    </developer>
+  </developers>
+  <scm>
+    <connection>https://github.com/jruby/jruby/tree/master/gems/bouncy-castle-java.git</connection>
+    <url>http://github.com/jruby/jruby/tree/master/gems/bouncy-castle-java/</url>
+  </scm>
+  <properties>
+    <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
+    <jruby.plugins.version>1.0.1</jruby.plugins.version>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcpkix-jdk15on</artifactId>
+      <version>1.49</version>
+    </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcprov-jdk15on</artifactId>
+      <version>1.49</version>
+    </dependency>
+  </dependencies>
+  <repositories>
+    <repository>
+      <id>rubygems-releases</id>
+      <url>http://rubygems-proxy.torquebox.org/releases</url>
+    </repository>
+  </repositories>
+  <build>
+    <extensions>
+      <extension>
+        <groupId>de.saumya.mojo</groupId>
+        <artifactId>gem-extension</artifactId>
+        <version>${jruby.plugins.version}</version>
+      </extension>
+    </extensions>
+    <directory>${basedir}/pkg</directory>
+    <plugins>
+      <plugin>
+        <groupId>de.saumya.mojo</groupId>
+        <artifactId>gem-maven-plugin</artifactId>
+        <version>${jruby.plugins.version}</version>
+        <configuration>
+          <gemspec>bouncy-castle-java.gemspec</gemspec>
+          <includeDependencies>true</includeDependencies>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>