maven-tools 0.32.4 → 0.32.5

data/README.md

@@ -4,6 +4,10 @@ maven tools
 * [![Build Status](https://secure.travis-ci.org/torquebox/maven-tools.png)](http://travis-ci.org/torquebox/maven-tools)
 * [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/torquebox/maven-tools)
 
+Note on Ruby-1.8
+----------------
+
+ordering is important within the pom.xml since it carry info on the sequence of execution. jruby and ruby-1.9 do iterate in same order as the keys gets included, that helps to copy the order of declaration from the ruby DSL over to pom.xml. with ruby-1.8 the hash behaviour is different and since ruby-1.8 is end of life there is no support for ruby-1.8. though it might just works fine on simple setup.
 
 Contributing
 ------------

data/lib/maven/model/model.rb

@@ -374,6 +374,11 @@ module Maven
         'project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"'
       end
 
+      def dump_pom( file = nil )
+        @dump_pom = file if file
+        @dump_pom
+      end
+
       def version(val = nil)
         self.version = val if val
         @version ||= (@parent.nil? ? '0.0.0' : @parent.version)
@@ -591,11 +596,11 @@ module Maven
       end
 
       def releases(args = {})
-        @releases ||=  OHash.new.replace(args)
+        @releases ||= args
       end
 
       def snapshots(args = {})
-        @snapshots ||= OHash.new.replace(args)
+        @snapshots ||= args
       end
 
       def to_xml(*args)
@@ -603,14 +608,6 @@ module Maven
       end
     end
 
-    class OHash < Hash
-      
-      def keys
-        k = super
-        k.sort { |n,m| n.to_s <=> m.to_s }
-      end
-    end
-
     class PluginRepository < Repository
       tags :dummy
       def _name
@@ -618,4 +615,4 @@ module Maven
       end
     end
   end
-end
+end

data/lib/maven/model/utils.rb

@@ -101,7 +101,7 @@ EOF
           when Hash
             if val.size > 0
               buf << "#{indent}  <#{var}>\n"
-              val.keys.sort{ |n,m| n.to_s <=> m.to_s }.each do |k|
+              val.keys.each do |k|
                 v = val[k]
                 if v.is_a? Tag
                   v.to_xml(buf, indent + "    ")
@@ -347,8 +347,7 @@ EOF
       end
       
       def map_to_xml(buf, indent, map)
-        # sort the hash over the keys
-        map.collect { |k,v| [k.to_s, v]}.sort.each do |k,v|
+        map.each do |k,v|
           case v
           when Hash
             buf << "#{indent}  <#{k}>\n"
@@ -374,6 +373,8 @@ EOF
                 buf << "#{indent}    <#{singular}>\n"
                 map_to_xml(buf, indent + "    ", i)
                 buf << "#{indent}    </#{singular}>\n"
+              when /^<.*>$/ #allow any kind of xml as is
+                buf << "#{indent}    #{i}\n"
               else
                 buf << "#{indent}    <#{singular}>#{i}</#{singular}>\n"
               end
@@ -389,4 +390,4 @@ EOF
       end
     end
   end
-end
+end

data/lib/maven/tools/gem_project.rb

@@ -17,31 +17,14 @@
 # COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
 # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# TODO make nice require after ruby-maven uses the same ruby files
-require File.join(File.dirname(File.dirname(__FILE__)), 'model', 'model.rb')
 require File.join(File.dirname(__FILE__), 'gemfile_lock.rb')
 require File.join(File.dirname(__FILE__), 'versions.rb')
-require File.join(File.dirname(__FILE__), 'jarfile.rb')
+require File.join(File.dirname(__FILE__), 'maven_project.rb')
 
 module Maven
   module Tools
 
-    class ArtifactPassthrough
-
-      def initialize(&block)
-        @block = block
-      end
-
-      def add_artifact(a)
-        @block.call(a)
-      end
-      
-      def add_repository(name, url)
-      end
-    end
-    
-    class GemProject < Maven::Model::Project
+    class GemProject < MavenProject
       tags :dummy
 
       def initialize(artifact_id = dir_name, version = "0.0.0", &block)
@@ -61,7 +44,7 @@ module Maven
 
       def load_gemspec(specfile)
         require 'rubygems'
-        if specfile.is_a? ::Gem::Specification 
+        if specfile.is_a? ::Gem::Specification
           spec = specfile
         else
           spec = ::Gem::Specification.load(specfile)
@@ -104,12 +87,12 @@ module Maven
         add_param(config, "rdocOptions", spec.rdoc_options)
         add_param(config, "requirePaths", spec.require_paths, ["lib"])
         add_param(config, "rubyforgeProject", spec.rubyforge_project)
-        add_param(config, "requiredRubygemsVersion", 
-                  spec.required_rubygems_version && spec.required_rubygems_version != ">= 0" ? "<![CDATA[#{spec.required_rubygems_version}]]>" : nil)
+        add_param(config, "requiredRubygemsVersion",
+                  spec.required_rubygems_version && spec.required_rubygems_version.to_s != ">= 0" ? "<![CDATA[#{spec.required_rubygems_version}]]>" : nil)
         add_param(config, "bindir", spec.bindir, "bin")
-        add_param(config, "requiredRubyVersion", 
-                  spec.required_ruby_version && spec.required_ruby_version != ">= 0" ? "<![CDATA[#{spec.required_ruby_version}]]>" : nil)
-        add_param(config, "postInstallMessage", 
+        add_param(config, "requiredRubyVersion",
+                  spec.required_ruby_version && spec.required_ruby_version.to_s != ">= 0" ? "<![CDATA[#{spec.required_ruby_version}]]>" : nil)
+        add_param(config, "postInstallMessage",
                   spec.post_install_message ? "<![CDATA[#{spec.post_install_message}]]>" : nil)
         add_param(config, "executables", spec.executables)
         add_param(config, "extensions", spec.extensions)
@@ -127,11 +110,11 @@ module Maven
         # end
         #add_param(config, "extraFiles", files)
         add_param(config, "files", spec.files)
-        
+
         plugin('gem').with(config) if config.size > 0
 
         spec.dependencies.each do |dep|
-          scope = 
+          scope =
             case dep.type
             when :runtime
               "compile"
@@ -172,17 +155,6 @@ module Maven
         end
       end
 
-      def load_mavenfile(file)
-        file = file.path if file.is_a?(File)
-        if File.exists? file
-          @current_file = file
-          content = File.read(file)
-          eval content
-        else
-          self
-        end
-      end
-
       def load_gemfile(file)
         file = file.path if file.is_a?(File)
         if File.exists? file
@@ -208,7 +180,7 @@ module Maven
           if @lock
             dependencies.each do |d|
               if d.group_id == 'rubygems' && @lock.keys.member?( d.artifact_id ) 
-                d.version = nil 
+                d.version = nil
               end
             end
           end
@@ -216,20 +188,6 @@ module Maven
           self
         end
       end
-      
-      def load_jarfile(file)
-        jars = Jarfile.new(file)
-        if jars.exists?
-          container = ArtifactPassthrough.new do |a|
-            artifactId, groupId, extension, version = a.split(/:/)
-            send(extension.to_sym, "#{artifactId}:#{groupId}", version)
-          end
-          if !jars.exists_lock? || jars.mtime > jars.mtime_lock
-            jars.populate_unlocked container
-          end
-          jars.populate_locked container
-        end
-      end
 
       def dir_name
         File.basename(File.expand_path("."))
@@ -241,7 +199,7 @@ module Maven
         versions = versions.merge(args) if args
 
         name "#{dir_name} - gem" unless name
-        
+
         packaging "gem" unless packaging
 
         repository("rubygems-releases").url = "http://rubygems-proxy.torquebox.org/releases" unless repository("rubygems-releases").url
@@ -253,7 +211,7 @@ module Maven
         #     r.releases(:enabled => false)
              r.snapshots(:enabled => true)
            end
-        end 
+        end
 
         # TODO go through all plugins to find out any SNAPSHOT version !!
         if versions[:jruby_plugins] =~ /-SNAPSHOT$/ || properties['jruby.plugins.version'] =~ /-SNAPSHOT$/
@@ -280,7 +238,7 @@ module Maven
             end
           end
         end
-        
+
         if @bundler_deps && @bundler_deps.size > 0
           plugin(:bundler)
           bdeps = []
@@ -298,10 +256,10 @@ module Maven
           @bundler_deps.each do |args, dep|
             bdeps << args unless has_gem? args[0]
           end
-          
+
           # now add the deps to bundler plugin
           # avoid to setup bundler if it has no deps
-          if bdeps.size > 0 
+          if bdeps.size > 0
             plugin(:bundler) do |bundler|
               # install will be triggered on initialize phase
               bundler.execution.goals << "install"
@@ -309,7 +267,7 @@ module Maven
               bdeps.each do |d|
                 bundler.gem(d)
               end
-              
+
               # use the locked down version if available
               if @lock
                 bundler.dependencies.each do |d|
@@ -344,8 +302,8 @@ module Maven
         end
 
         self.properties = {
-          "project.build.sourceEncoding" => "UTF-8", 
-          "gem.home" => "${project.build.directory}/rubygems", 
+          "project.build.sourceEncoding" => "UTF-8",
+          "gem.home" => "${project.build.directory}/rubygems",
           "gem.path" => "${project.build.directory}/rubygems",
           "jruby.plugins.version" => versions[:jruby_plugins]
         }.merge(self.properties)
@@ -353,10 +311,10 @@ module Maven
         has_plugin_gems = build.plugins.detect do |k, pl|
           pl.dependencies.detect { |d| d.type.to_sym == :gem } if pl.dependencies
         end
-        
+
         if has_plugin_gems
           plugin_repository("rubygems-releases").url = "http://rubygems-proxy.torquebox.org/releases" unless plugin_repository("rubygems-releases").url
-        
+
           # unless plugin_repository("rubygems-prereleases").url
           #   plugin_repository("rubygems-prereleases") do |r|
           #     r.url = "http://rubygems-proxy.torquebox.org/prereleases"
@@ -367,8 +325,8 @@ module Maven
         end
         # TODO
         configs = {
-          :gem => [:initialize], 
-          :rails3 => [:initialize, :pom], 
+          :gem => [:initialize],
+          :rails3 => [:initialize, :pom],
           :bundler => [:install]
         }.collect do |name, goals|
           if plugin?(name)
@@ -386,8 +344,8 @@ module Maven
         configs.delete_if { |c| c.nil? }
         if configs.size > 0
           build.plugin_management do |pm|
-            options = { 
-              :lifecycleMappingMetadata => { 
+            options = {
+              :lifecycleMappingMetadata => {
                 :pluginExecutions => Maven::Model::NamedArray.new(:pluginExecution) do |e|
                   # sort them - handy for testing
                   configs.sort {|m,n| m[:pluginExecutionFilter][:artifactId].to_s <=> n[:pluginExecutionFilter][:artifactId].to_s }.each { |c| e << c }
@@ -414,7 +372,7 @@ module Maven
           end
         end
       end
-      
+
       def has_gem?(gem)
         self.gem?(gem)
       end
@@ -436,7 +394,7 @@ module Maven
         @stack ||= [[:default]]
       end
       private :stack
-        
+
       def group(*args, &block)
         stack << args
         block.call if block

data/lib/maven/tools/maven_project.rb

@@ -0,0 +1,71 @@
+#
+# Copyright (C) 2013 Christian Meier
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# TODO make nice require after ruby-maven uses the same ruby files
+require File.join(File.dirname(File.dirname(__FILE__)), 'model', 'model.rb')
+require File.join(File.dirname(__FILE__), 'jarfile.rb')
+
+module Maven
+  module Tools
+
+    class ArtifactPassthrough
+
+      def initialize(&block)
+        @block = block
+      end
+
+      def add_artifact(a)
+        @block.call(a)
+      end
+
+      def add_repository(name, url)
+      end
+    end
+
+    class MavenProject < Maven::Model::Project
+      tags :dummy
+
+      def load_mavenfile(file)
+        file = file.path if file.is_a?(File)
+        if File.exists? file
+          @current_file = file
+          content = File.read(file)
+          eval content
+        else
+          self
+        end
+      end
+
+      def load_jarfile(file)
+        jars = Jarfile.new(file)
+        if jars.exists?
+          container = ArtifactPassthrough.new do |a|
+            artifactId, groupId, extension, version = a.split(/:/)
+            send(extension.to_sym, "#{artifactId}:#{groupId}", version)
+          end
+          if !jars.exists_lock? || jars.mtime > jars.mtime_lock
+            jars.populate_unlocked container
+          end
+          jars.populate_locked container
+        end
+      end
+    end
+  end
+end

data/lib/maven/tools/version.rb

@@ -20,6 +20,6 @@
 #
 module Maven
   module Tools
-    VERSION = '0.32.4'.freeze
+    VERSION = '0.32.5'.freeze
   end
 end

data/lib/maven/tools/versions.rb

@@ -22,13 +22,13 @@ module Maven
   module Tools
     unless defined? VERSIONS
       VERSIONS = { 
-        :jruby_rack => "1.1.13.1",
-        :assembly_plugin => "2.3",
+        :jruby_rack => "1.1.13.2",
+        :assembly_plugin => "2.4",
         :war_plugin => "2.2",
         :jar_plugin => "2.4",
-        :jruby_plugins => "0.29.4",
-        :bundler_version => "1.2.3",
-        :jruby_version => defined?(JRUBY_VERSION) ? JRUBY_VERSION : "1.7.3"
+        :jruby_plugins => "1.0.0-beta",
+        :bundler_version => "1.3.5",
+        :jruby_version => defined?(JRUBY_VERSION) ? JRUBY_VERSION : "1.7.4"
       }.freeze
     end
   end

data/rspec/maven/model/model_spec.rb

@@ -21,6 +21,7 @@ XML
     
     it 'should setup a minimal project' do
       project = Maven::Model::Project.new
+      project.dump_pom 'pom-ng.xml'
       project.artifact_id = 'mini'
       project.parent('test:parent', '1.2.3')
       project.to_xml.should == <<-XML
@@ -148,25 +149,25 @@ XML
   <artifactId>project</artifactId>
   <version>0.0.0</version>
   <repositories>
+    <repository>
+      <id>rubygems-releases</id>
+      <url>http://rubygems-proxy.torquebox.org/releases</url>
+    </repository>
     <repository>
       <id>jboss-public-repository-group</id>
       <name>JBoss Public Maven Repository Group</name>
       <url>https://repository.jboss.org/nexus/content/groups/public-jboss/</url>
       <releases>
-        <checksumPolicy>strict</checksumPolicy>
         <enabled>false</enabled>
         <updatePolicy>never</updatePolicy>
+        <checksumPolicy>strict</checksumPolicy>
       </releases>
       <snapshots>
-        <checksumPolicy>ignore</checksumPolicy>
         <enabled>true</enabled>
         <updatePolicy>daily</updatePolicy>
+        <checksumPolicy>ignore</checksumPolicy>
       </snapshots>
     </repository>
-    <repository>
-      <id>rubygems-releases</id>
-      <url>http://rubygems-proxy.torquebox.org/releases</url>
-    </repository>
   </repositories>
   <pluginRepositories>
     <pluginRepository>
@@ -343,6 +344,9 @@ XML
   <version>0.0.0</version>
   <build>
     <plugins>
+      <plugin>
+        <artifactId>maven-release-plugin</artifactId>
+      </plugin>
       <plugin>
         <artifactId>maven-clean-plugin</artifactId>
         <version>2.4.1</version>
@@ -355,9 +359,6 @@ XML
           <target>1.5</target>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-release-plugin</artifactId>
-      </plugin>
     </plugins>
   </build>
 </project>
@@ -378,31 +379,31 @@ XML
     <plugins>
       <plugin>
         <groupId>de.saumya.mojo</groupId>
-        <artifactId>cucumber-maven-plugin</artifactId>
+        <artifactId>gem-maven-plugin</artifactId>
+        <extensions>true</extensions>
         <executions>
           <execution>
-            <id>in_phase_integration_test</id>
-            <phase>integration-test</phase>
+            <id>in_phase_pre_integration_test</id>
+            <phase>pre-integration-test</phase>
             <goals>
-              <goal>test</goal>
+              <goal>install</goal>
             </goals>
-            <configuration>
-              <cucumberArgs>--no-colors</cucumberArgs>
-            </configuration>
           </execution>
         </executions>
       </plugin>
       <plugin>
         <groupId>de.saumya.mojo</groupId>
-        <artifactId>gem-maven-plugin</artifactId>
-        <extensions>true</extensions>
+        <artifactId>cucumber-maven-plugin</artifactId>
         <executions>
           <execution>
-            <id>in_phase_pre_integration_test</id>
-            <phase>pre-integration-test</phase>
+            <id>in_phase_integration_test</id>
+            <phase>integration-test</phase>
             <goals>
-              <goal>install</goal>
+              <goal>test</goal>
             </goals>
+            <configuration>
+              <cucumberArgs>--no-colors</cucumberArgs>
+            </configuration>
           </execution>
         </executions>
       </plugin>
@@ -455,31 +456,6 @@ XML
   <version>0.0.0</version>
   <build>
     <plugins>
-      <plugin>
-        <artifactId>maven-war-plugin</artifactId>
-        <configuration>
-          <webResources>
-            <resource>
-              <directory>public</directory>
-            </resource>
-            <resource>
-              <directory>.</directory>
-              <includes>
-                <include>app/**</include>
-                <include>config/**</include>
-                <include>lib/**</include>
-                <include>vendor/**</include>
-                <include>Gemfile</include>
-              </includes>
-              <targetPath>WEB-INF</targetPath>
-            </resource>
-            <resource>
-              <directory>${gem.path}</directory>
-              <targetPath>WEB-INF/gems</targetPath>
-            </resource>
-          </webResources>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>gwt-maven-plugin</artifactId>
@@ -516,6 +492,31 @@ XML
           </connectors>
         </configuration>
       </plugin>
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <configuration>
+          <webResources>
+            <resource>
+              <directory>public</directory>
+            </resource>
+            <resource>
+              <directory>.</directory>
+              <targetPath>WEB-INF</targetPath>
+              <includes>
+                <include>app/**</include>
+                <include>config/**</include>
+                <include>lib/**</include>
+                <include>vendor/**</include>
+                <include>Gemfile</include>
+              </includes>
+            </resource>
+            <resource>
+              <directory>${gem.path}</directory>
+              <targetPath>WEB-INF/gems</targetPath>
+            </resource>
+          </webResources>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>