ruby-maven 3.0.3.0.28.5 → 3.0.3.0.29.0.pre

data/lib/ruby/maven/model/model.rb

@@ -257,9 +257,9 @@ module Maven
         end
         self
       end
-
+ 
       def _name
-        "project"
+        '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 version(val = nil)

data/lib/ruby/maven/model/model_utils.rb

@@ -97,7 +97,7 @@ EOF
             buf << "#{indent}  <#{var}>#{val}</#{var}>\n" if val
           end
         end
-        buf << "#{indent}</#{_name}>\n"
+        buf << "#{indent}</#{_name.sub(/ .*$/, '')}>\n"
         buf
       end
     end
@@ -188,7 +188,7 @@ EOF
       def adjust_key(name)
         name = name.to_s
         if (name =~ /\:/).nil?
-          if [:jruby, :gem, :rspec, :rake, :rails2, :rails3, :gemify, :cucumber, :runit, :bundler].member? name.to_sym
+          if [:jruby, :gem, :rspec, :rake, :minitest, :rails3, :gemify, :cucumber, :runit, :bundler].member? name.to_sym
             "de.saumya.mojo:#{name}-maven-plugin"
           else
             "maven-#{name}-plugin"

data/lib/ruby/maven/tools/gem_project.rb

@@ -171,9 +171,13 @@ module Maven
 
         repository("rubygems-releases").url = "http://rubygems-proxy.torquebox.org/releases" unless repository("rubygems-releases").url
         
-        has_prerelease = dependencies.detect { |d| d.type.to_sym == :gem && d.version =~ /[a-zA-Z]/ }
-
-        repository("rubygems-prereleases").url = "http://rubygems-proxy.torquebox.org/prereleases" if has_prerelease && !repository("rubygems-prereleases").url
+        unless repository("rubygems-prereleases").url
+          repository("rubygems-prereleases") do |r|
+            r.url = "http://rubygems-proxy.torquebox.org/prereleases"
+            r.releases(:enabled => false)
+            r.snapshots(:enabled => true)
+          end
+        end
 
         # TODO go through all plugins to find out any SNAPSHOT version !!
         if versions[:jruby_plugins] =~ /-SNAPSHOT$/ || properties['jruby.plugins.version'] =~ /-SNAPSHOT$/
@@ -188,10 +192,15 @@ module Maven
           gem = plugin(:gem)
           gem.version = "${jruby.plugins.version}" unless gem.version
           gem.extensions = true if packaging =~ /gem/
+          if File.exists?('lib') && File.exists?(File.join('src', 'main', 'java'))
+            plugin(:jar) do |j|
+              j.version = versions[:jar_plugin] unless j.version
+              j.in_phase('prepare-package').execute_goal(:jar).with :outputDirectory => '${project.basedir}/lib', :finalName => '${project.artifactId}'
+            end
+          end
         end
-
+        
         if plugin?(:bundler)
-          plugin_repository("rubygems-releases").url = "http://rubygems-proxy.torquebox.org/releases" unless plugin_repository("rubygems-releases").url
           bundler = plugin(:bundler)
           bundler.version = "${jruby.plugins.version}" unless bundler.version
           bundler.executions.goals << "install"
@@ -204,6 +213,8 @@ module Maven
           #add_test_plugin(nil, "test")
           add_test_plugin("rspec", "spec")
           add_test_plugin("cucumber", "features")
+          add_test_plugin("minitest", "test")
+          add_test_plugin("minitest", "spec", 'spec')
         end
 
         self.properties = {
@@ -212,13 +223,29 @@ module Maven
           "gem.path" => "${project.build.directory}/rubygems",
           "jruby.plugins.version" => versions[:jruby_plugins]
         }.merge(self.properties)
+
+        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"
+              r.releases(:enabled => false)
+              r.snapshots(:enabled => true)
+            end
+          end
+        end
       end
 
-      def add_test_plugin(name, test_dir)
+      def add_test_plugin(name, test_dir, goal = 'test')
         unless plugin?(name)
           has_gem = name.nil? ? true : gem?(name)
           if has_gem && File.exists?(test_dir)
-            plugin(name || 'runit', "${jruby.plugins.version}").execution.goals << "test" 
+            plugin(name || 'runit', "${jruby.plugins.version}").execution.goals << goal
           end
         else
           pl = plugin(name || 'runit')
@@ -332,7 +359,7 @@ module Maven
           bundler_deps = []
           #plugin(:bundler) do |bundler|
           # use a dep with version so just create it from the args
-          bundler_deps << args unless project.dependencies.member? dep
+          bundler_deps << args
             
           #TODO this should be done after all deps are in place - otherwise it depends on order how bundler gets setup
           if @lock

data/lib/ruby/maven/tools/rails_project.rb

@@ -79,6 +79,7 @@ module Maven
             end
           })
 
+        profile(:assets).activation.by_default if profiles.key?(:assets)
         profile(:development).activation.by_default
         profile(:test).activation.property("rails.env", "test")
         profile(:production) do |prod|   

data/lib/ruby/maven/tools/versions.rb

@@ -4,8 +4,9 @@
       :jetty_plugin => "7.5.1.v20110908",
       :jruby_rack => "1.0.10",
       :war_plugin => "2.1.1",
-      :jruby_plugins => "0.28.5",
-      :jruby_version => "1.6.4",
+      :jar_plugin => "2.3.1",
+      :jruby_plugins => "0.29.0-SNAPSHOT",
+      :jruby_version => defined?(JRUBY_VERSION) ? JRUBY_VERSION : '1.6.7'
     }.freeze
   end
 end

data/lib/ruby/ruby_maven.rb

@@ -189,10 +189,12 @@ module Maven
     def exec(*args)
       log(args)
       a = command_line(args.dup.flatten)
+      verbose = options.delete('--verbose')
+      no_pom = options.delete('--no-pom')
       a << options_array
       a.flatten!
-      a = generate_pom(*a)
-      puts a.join ' '
+      a = generate_pom(*a) unless no_pom
+      puts a.join ' ' if verbose
       if defined? JRUBY_VERSION
         # TODO use a setup like maven_gemify from jruby to launch maven
         launch_java(a)

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-maven
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 3.0.3.0.28.5
+  prerelease: 13
+  version: 3.0.3.0.29.0.pre
 platform: ruby
 authors: 
   - mkristian
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-13 00:00:00 +05:30
-default_executable: 
+date: 2012-04-17 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: thor
@@ -58,12 +57,12 @@ files:
   - lib/aether-util-1.11.jar
   - lib/maven-settings-builder-3.0.3.jar
   - lib/wagon-provider-api-1.0-beta-7.jar
+  - lib/ruby-maven-3.0.3.0.29.0.pre.jar
   - lib/maven-settings-3.0.3.jar
   - lib/maven-embedder-3.0.3.jar
   - lib/maven-aether-provider-3.0.3.jar
   - lib/plexus-component-annotations-1.5.5.jar
   - lib/wagon-http-shared-1.0-beta-7.jar
-  - lib/ruby-maven-3.0.3.0.28.5.jar
   - lib/maven-model-builder-3.0.3.jar
   - lib/maven-repository-metadata-3.0.3.jar
   - lib/maven-model-3.0.3.jar
@@ -98,7 +97,6 @@ files:
   - lib/ruby/maven/model/model_utils.rb
   - lib/ruby/maven/model/model.rb
   - lib/ruby/maven/model/dependencies.rb
-has_rdoc: true
 homepage: http://github.com/mkristian/ruby-maven
 licenses: []
 
@@ -123,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.1
+rubygems_version: 1.8.9
 signing_key: 
 specification_version: 3
 summary: maven support for ruby projects with gemspec, Gemfile