maven-tools 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 206d48cf997e1148c90278188e106c7441afffc6
-  data.tar.gz: 36ace5b7cb4610ff933f70727ab11b86597b5deb
+  metadata.gz: 2835f257ca8d7a4f674d3467b985f13b6cd904b4
+  data.tar.gz: 5b3214884d8abf05f1f95b748bcbdee22083f4ca
 SHA512:
-  metadata.gz: a3c6171e65977ed44938e22501978ee4900789b599ea0216302460f0a9ab4686d899f0b0a545ce6b0fbebcc99ce37db78182f9464f4c9982038fb3d3bc963477
-  data.tar.gz: 69dcaef8afaa9a5baed082ba96ab4514861b07ae211f1444369fe64ac1f1d74ade0388d8a59cc771dae06c1513d9429062652f2e7e2285e7e6d16039a00ea481
+  metadata.gz: 5e171ae444c08355dcdde8ba8b5c31396fbc8edebb8201544d26ab618b57e1c219c0e85df9cc60afdee9ce097a07bdc228d5de17b142496d78009dcef97d2310
+  data.tar.gz: 2b9919b02df3a24651df6f3400a87a03da53cadf6c482ba89ee97c499ea5217ff450dbeb3278dc614ed5e9cd4e5b06422e481412fd0c44984a5a066e310343a7

data/Mavenfile

@@ -2,8 +2,7 @@
 
 gemspec
 
-plugin( 'de.saumya.mojo:minitest-maven-plugin', '${jruby.plugins.version}', 
-        :minispecDirectory =>"spec/*spec.rb" ) do
+jruby_plugin( :minitest, :minispecDirectory =>"spec/*spec.rb" ) do
   execute_goals(:spec)
 end
 

data/lib/maven/tools/dsl.rb

@@ -98,7 +98,7 @@ module Maven
       end
 
       def group( *args )
-        @group = args[ 0 ]
+        @group = args
         yield
       ensure
         @group = nil
@@ -315,7 +315,7 @@ module Maven
 
         if options[ :skip_locked ] or not file.exists_lock?
           file.populate_unlocked do |dsl|
-            setup_jruby( dsl.jruby )
+            jarfile_dsl( dsl )
             dsl.artifacts.each do |a|
               _dependency a
             end
@@ -325,7 +325,7 @@ module Maven
             artifact( dep )
           end
           file.populate_unlocked do |dsl|
-            setup_jruby( dsl.jruby )
+            jarfile_dsl( dsl )
             dsl.artifacts.each do |a|
               if a[ :system_path ]
                 dependeny a
@@ -334,6 +334,17 @@ module Maven
           end
         end
       end
+      
+      def jarfile_dsl( dsl )
+        setup_jruby( dsl.jruby )
+        dsl.repositories.each do |r|
+          repository r.merge( {:id => r[:name] } )
+        end
+        dsl.snapshot_repositories.each do |r|
+          snapshot_repository r.merge( {:id => r[:name] } )
+        end
+      end
+      private :jarfile_dsl
 
       def gemspec( name = nil, options = {} )
         if @inside_gemfile == true
@@ -1269,12 +1280,12 @@ module Maven
             platform = options.delete( :platform ) || options.delete( 'platform' )
             group = options.delete( :group ) || options.delete( 'group' ) || @group
             if group
-               case group.to_sym
-               when :test
-                 options[ :scope ] = :test 
-               when :development
-                 options[ :scope ] = :provided
-               end
+              group = [ group ].flatten.each { |g| g.to_sym }
+              if group.member? :development
+                options[ :scope ] = :provided
+              elsif group.member? :test
+                options[ :scope ] = :test 
+              end
             end
             if platform.nil? || is_jruby_platform( platform )
               options[ :version ] = '[0,)' if args.size == 2 && options[ :version ].nil? && options[ 'version' ].nil?

data/lib/maven/tools/version.rb

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

data/spec/gemfile_with_groups/Gemfile

@@ -1,9 +1,15 @@
 #-*- mode: ruby -*-
 
-group :test do
+group :test, :development do
   gem 'rspec',        '2.13.0'
 end
 
-gem 'copyright-headers', '1.0.3', :group => :development
+group :test do
+  gem 'cucumber',        '2.13.0'
+end
+
+gem 'copyright-header', '1.0.3', :group => [:development, :test]
+
+gem 'minitest', '0.5.3', :group => :test
 
 # vim: syntax=Ruby

data/spec/gemfile_with_groups/pom.xml

@@ -25,15 +25,29 @@
       <artifactId>rspec</artifactId>
       <version>2.13.0</version>
       <type>gem</type>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>rubygems</groupId>
+      <artifactId>cucumber</artifactId>
+      <version>2.13.0</version>
+      <type>gem</type>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>rubygems</groupId>
-      <artifactId>copyright-headers</artifactId>
+      <artifactId>copyright-header</artifactId>
       <version>1.0.3</version>
       <type>gem</type>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>rubygems</groupId>
+      <artifactId>minitest</artifactId>
+      <version>0.5.3</version>
+      <type>gem</type>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <repositories>
     <repository>

data/spec/pom_from_jarfile_with_repos/Jarfile

@@ -0,0 +1,5 @@
+source "http://1.2.3.4/artifactory/"
+repository 'takari', "http://otto.takari.io:8081/nexus/content/groups/public"
+snapshot_repository 'tesla', "http://repository.tesla.io:8081/nexus/content/groups/public"
+
+jar 'junit:junit', '4.11'

data/spec/pom_from_jarfile_with_repos/Mavenfile

@@ -0,0 +1 @@
+jarfile

data/spec/pom_from_jarfile_with_repos/pom.xml

@@ -0,0 +1,55 @@
+<?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>dummy</groupId>
+  <artifactId>pom_from_jarfile_with_repos</artifactId>
+  <version>0.0.0</version>
+  <name>pom_from_jarfile_with_repos</name>
+  <dependencies>
+    <dependency>
+      <groupId>org.jruby</groupId>
+      <artifactId>jruby</artifactId>
+      <version>1.7.13</version>
+      <type>pom</type>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+    </dependency>
+  </dependencies>
+  <repositories>
+    <repository>
+      <id>http://1.2.3.4/artifactory/</id>
+      <name>http://1.2.3.4/artifactory/</name>
+      <url>http://1.2.3.4/artifactory/</url>
+    </repository>
+    <repository>
+      <id>takari</id>
+      <name>takari</name>
+      <url>http://otto.takari.io:8081/nexus/content/groups/public</url>
+    </repository>
+    <repository>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <id>tesla</id>
+      <name>tesla</name>
+      <url>http://repository.tesla.io:8081/nexus/content/groups/public</url>
+    </repository>
+  </repositories>
+</project>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maven-tools
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Christian Meier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-06-29 00:00:00.000000000 Z
+date: 2014-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
@@ -102,6 +102,7 @@ files:
 - spec/pom.xml
 - spec/gemfile_with_source/pom.xml
 - spec/gemspec_in_profile/pom.xml
+- spec/pom_from_jarfile_with_repos/pom.xml
 - spec/gemfile_with_lock/pom.xml
 - spec/gemfile_with_test_group/pom.xml
 - spec/gemspec_with_prereleased_dependency_and_no_repo/pom.xml
@@ -134,6 +135,8 @@ files:
 - spec/gemfile_with_extras/pom.xml
 - spec/gemfile_with_source/Mavenfile
 - spec/gemspec_in_profile/Mavenfile
+- spec/pom_from_jarfile_with_repos/Jarfile
+- spec/pom_from_jarfile_with_repos/Mavenfile
 - spec/gemfile_with_lock/Mavenfile
 - spec/gemfile_with_lock/Gemfile
 - spec/gemfile_with_test_group/Mavenfile
@@ -267,6 +270,7 @@ test_files:
 - spec/pom.xml
 - spec/gemfile_with_source/pom.xml
 - spec/gemspec_in_profile/pom.xml
+- spec/pom_from_jarfile_with_repos/pom.xml
 - spec/gemfile_with_lock/pom.xml
 - spec/gemfile_with_test_group/pom.xml
 - spec/gemspec_with_prereleased_dependency_and_no_repo/pom.xml
@@ -299,6 +303,8 @@ test_files:
 - spec/gemfile_with_extras/pom.xml
 - spec/gemfile_with_source/Mavenfile
 - spec/gemspec_in_profile/Mavenfile
+- spec/pom_from_jarfile_with_repos/Jarfile
+- spec/pom_from_jarfile_with_repos/Mavenfile
 - spec/gemfile_with_lock/Mavenfile
 - spec/gemfile_with_lock/Gemfile
 - spec/gemfile_with_test_group/Mavenfile