maven-tools 1.0.1 → 1.0.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (17) hide show
  1. checksums.yaml +4 -4
  2. data/lib/maven/tools/dsl.rb +4 -4
  3. data/lib/maven/tools/version.rb +1 -1
  4. data/spec/gemfile_with_groups/Gemfile +2 -0
  5. data/spec/gemfile_with_groups/pom.xml +8 -1
  6. data/spec/gemfile_with_groups_and_lockfile/pom.xml +1 -1
  7. data/spec/gemfile_with_path/pom.xml +1 -1
  8. data/spec/gemfile_with_platforms/Gemfile +17 -0
  9. data/spec/gemfile_with_platforms/Mavenfile +5 -0
  10. data/spec/gemfile_with_platforms/pom.xml +59 -0
  11. data/spec/gemfile_with_test_group/pom.xml +1 -1
  12. data/spec/gemfile_without_gemspec/pom.xml +1 -1
  13. data/spec/gemspec_in_profile/pom.xml +1 -1
  14. data/spec/pom_from_jarfile/pom.xml +1 -1
  15. data/spec/pom_from_jarfile_with_repos/pom.xml +1 -1
  16. data/spec/pom_with_execute/pom.xml +1 -1
  17. metadata +8 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 2835f257ca8d7a4f674d3467b985f13b6cd904b4
4
- data.tar.gz: 5b3214884d8abf05f1f95b748bcbdee22083f4ca
3
+ metadata.gz: a3496b1d7350042ecf4c6ed4d14b8034c46e40bd
4
+ data.tar.gz: 6081a2253e730e0eedda2527ab555e336ea49840
5
5
  SHA512:
6
- metadata.gz: 5e171ae444c08355dcdde8ba8b5c31396fbc8edebb8201544d26ab618b57e1c219c0e85df9cc60afdee9ce097a07bdc228d5de17b142496d78009dcef97d2310
7
- data.tar.gz: 2b9919b02df3a24651df6f3400a87a03da53cadf6c482ba89ee97c499ea5217ff450dbeb3278dc614ed5e9cd4e5b06422e481412fd0c44984a5a066e310343a7
6
+ metadata.gz: aac0f86a81b452d6f374d9b4361b7376a0cc03024970c1d532c2a64949fb6362c5b6965e875672ad3a76e0a70fc78b0c5e97060f6afdde6caebf503d8d3eed2f
7
+ data.tar.gz: 0ab7dbb37e99c36f0ed2ebd6fb2ae7d9dffc23e29d9db110bcd9576fcd66b52da963e90b1ba17b5b1c13133d689e5cb2ee3e9f4e38b787ac1da12eb6f1d93314
data/lib/maven/tools/dsl.rb CHANGED
@@ -13,7 +13,7 @@ module Maven
13
13
  @model = Model.new
14
14
  @model.model_version = '4.0.0'
15
15
  @model.name = ::File.basename( basedir )
16
- @model.group_id = 'dummy'
16
+ @model.group_id = 'no_group_id_given'
17
17
  @model.artifact_id = model.name
18
18
  @model.version = '0.0.0'
19
19
  @context = :project
@@ -87,7 +87,7 @@ module Maven
87
87
  end
88
88
 
89
89
  def is_jruby_platform( *args )
90
- args.detect { |a| :jruby == a.to_sym }
90
+ args.flatten.detect { |a| :jruby == a.to_sym }
91
91
  end
92
92
  private :is_jruby_platform
93
93
 
@@ -1277,8 +1277,8 @@ module Maven
1277
1277
  elsif options.key?( :path )
1278
1278
  @has_path = true
1279
1279
  else
1280
- platform = options.delete( :platform ) || options.delete( 'platform' )
1281
- group = options.delete( :group ) || options.delete( 'group' ) || @group
1280
+ platform = options.delete( :platform ) || options.delete( 'platform' ) || options.delete( :platforms ) || options.delete( 'platforms' )
1281
+ group = options.delete( :groups ) || options.delete( 'groups' ) || options.delete( :group ) || options.delete( 'group' ) || @group
1282
1282
  if group
1283
1283
  group = [ group ].flatten.each { |g| g.to_sym }
1284
1284
  if group.member? :development
data/lib/maven/tools/version.rb CHANGED
@@ -20,6 +20,6 @@
20
20
  #
21
21
  module Maven
22
22
  module Tools
23
- VERSION = '1.0.1'.freeze
23
+ VERSION = '1.0.2'.freeze
24
24
  end
25
25
  end
data/spec/gemfile_with_groups/Gemfile CHANGED
@@ -12,4 +12,6 @@ gem 'copyright-header', '1.0.3', :group => [:development, :test]
12
12
 
13
13
  gem 'minitest', '0.5.3', :group => :test
14
14
 
15
+ gem 'virtus', '1.0.2', :groups => :test
16
+
15
17
  # vim: syntax=Ruby
data/spec/gemfile_with_groups/pom.xml CHANGED
@@ -11,7 +11,7 @@
11
11
  <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"
12
12
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
13
13
  <modelVersion>4.0.0</modelVersion>
14
- <groupId>dummy</groupId>
14
+ <groupId>no_group_id_given</groupId>
15
15
  <artifactId>gemfile_with_groups</artifactId>
16
16
  <version>0.0.0</version>
17
17
  <name>gemfile_with_groups</name>
@@ -48,6 +48,13 @@
48
48
  <type>gem</type>
49
49
  <scope>test</scope>
50
50
  </dependency>
51
+ <dependency>
52
+ <groupId>rubygems</groupId>
53
+ <artifactId>virtus</artifactId>
54
+ <version>1.0.2</version>
55
+ <type>gem</type>
56
+ <scope>test</scope>
57
+ </dependency>
51
58
  </dependencies>
52
59
  <repositories>
53
60
  <repository>
data/spec/gemfile_with_groups_and_lockfile/pom.xml CHANGED
@@ -11,7 +11,7 @@
11
11
  <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"
12
12
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
13
13
  <modelVersion>4.0.0</modelVersion>
14
- <groupId>dummy</groupId>
14
+ <groupId>no_group_id_given</groupId>
15
15
  <artifactId>gemfile_with_groups_and_lockfile</artifactId>
16
16
  <version>0.0.0</version>
17
17
  <name>gemfile_with_groups_and_lockfile</name>
data/spec/gemfile_with_path/pom.xml CHANGED
@@ -11,7 +11,7 @@
11
11
  <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"
12
12
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
13
13
  <modelVersion>4.0.0</modelVersion>
14
- <groupId>dummy</groupId>
14
+ <groupId>no_group_id_given</groupId>
15
15
  <artifactId>gemfile_with_path</artifactId>
16
16
  <version>0.0.0</version>
17
17
  <name>gemfile_with_path</name>
data/spec/gemfile_with_platforms/Gemfile ADDED
@@ -0,0 +1,17 @@
1
+ #-*- mode: ruby -*-
2
+
3
+ platforms :ruby, :mri_18 do
4
+ gem 'rspec', '2.13.0'
5
+ end
6
+
7
+ platforms :jruby do
8
+ gem 'cucumber', '2.13.0'
9
+ end
10
+
11
+ gem 'copyright-header', '1.0.3', :platform => [:mri_19, :mri_20]
12
+
13
+ gem 'minitest', '0.5.3', :platform => :ruby
14
+
15
+ gem 'virtus', '1.0.2', :platforms => :jruby
16
+
17
+ # vim: syntax=Ruby
data/spec/gemfile_with_platforms/Mavenfile ADDED
@@ -0,0 +1,5 @@
1
+ #-*- mode: ruby -*-
2
+
3
+ gemfile
4
+
5
+ # vim: syntax=Ruby
data/spec/gemfile_with_platforms/pom.xml ADDED
@@ -0,0 +1,59 @@
1
+ <?xml version="1.0" encoding="UTF-8"?>
2
+ <!--
3
+
4
+ Copyright (c) 2012 to original author or authors
5
+ All rights reserved. This program and the accompanying materials
6
+ are made available under the terms of the Eclipse Public License v1.0
7
+ which accompanies this distribution, and is available at
8
+ http://www.eclipse.org/legal/epl-v10.html
9
+
10
+ -->
11
+ <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"
12
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
13
+ <modelVersion>4.0.0</modelVersion>
14
+ <groupId>no_group_id_given</groupId>
15
+ <artifactId>gemfile_with_platforms</artifactId>
16
+ <version>0.0.0</version>
17
+ <name>gemfile_with_platforms</name>
18
+ <properties>
19
+ <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
20
+ <jruby.plugins.version>1.0.3</jruby.plugins.version>
21
+ </properties>
22
+ <dependencies>
23
+ <dependency>
24
+ <groupId>rubygems</groupId>
25
+ <artifactId>cucumber</artifactId>
26
+ <version>2.13.0</version>
27
+ <type>gem</type>
28
+ </dependency>
29
+ <dependency>
30
+ <groupId>rubygems</groupId>
31
+ <artifactId>virtus</artifactId>
32
+ <version>1.0.2</version>
33
+ <type>gem</type>
34
+ </dependency>
35
+ </dependencies>
36
+ <repositories>
37
+ <repository>
38
+ <id>rubygems-releases</id>
39
+ <url>http://rubygems-proxy.torquebox.org/releases</url>
40
+ </repository>
41
+ </repositories>
42
+ <build>
43
+ <plugins>
44
+ <plugin>
45
+ <groupId>de.saumya.mojo</groupId>
46
+ <artifactId>gem-maven-plugin</artifactId>
47
+ <version>${jruby.plugins.version}</version>
48
+ <executions>
49
+ <execution>
50
+ <id>install gems</id>
51
+ <goals>
52
+ <goal>initialize</goal>
53
+ </goals>
54
+ </execution>
55
+ </executions>
56
+ </plugin>
57
+ </plugins>
58
+ </build>
59
+ </project>
data/spec/gemfile_with_test_group/pom.xml CHANGED
@@ -2,7 +2,7 @@
2
2
  <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"
3
3
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4
4
  <modelVersion>4.0.0</modelVersion>
5
- <groupId>dummy</groupId>
5
+ <groupId>no_group_id_given</groupId>
6
6
  <artifactId>gemfile_with_test_group</artifactId>
7
7
  <version>0.0.0</version>
8
8
  <name>gemfile_with_test_group</name>
data/spec/gemfile_without_gemspec/pom.xml CHANGED
@@ -11,7 +11,7 @@
11
11
  <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"
12
12
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
13
13
  <modelVersion>4.0.0</modelVersion>
14
- <groupId>dummy</groupId>
14
+ <groupId>no_group_id_given</groupId>
15
15
  <artifactId>gemfile_without_gemspec</artifactId>
16
16
  <version>0.0.0</version>
17
17
  <name>gemfile_without_gemspec</name>
data/spec/gemspec_in_profile/pom.xml CHANGED
@@ -11,7 +11,7 @@
11
11
  <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"
12
12
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
13
13
  <modelVersion>4.0.0</modelVersion>
14
- <groupId>dummy</groupId>
14
+ <groupId>no_group_id_given</groupId>
15
15
  <artifactId>gemspec_in_profile</artifactId>
16
16
  <version>0.0.0</version>
17
17
  <name>gemspec_in_profile</name>
data/spec/pom_from_jarfile/pom.xml CHANGED
@@ -11,7 +11,7 @@
11
11
  <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"
12
12
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
13
13
  <modelVersion>4.0.0</modelVersion>
14
- <groupId>dummy</groupId>
14
+ <groupId>no_group_id_given</groupId>
15
15
  <artifactId>pom_from_jarfile</artifactId>
16
16
  <version>0.0.0</version>
17
17
  <name>example from jarfile</name>
data/spec/pom_from_jarfile_with_repos/pom.xml CHANGED
@@ -11,7 +11,7 @@
11
11
  <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"
12
12
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
13
13
  <modelVersion>4.0.0</modelVersion>
14
- <groupId>dummy</groupId>
14
+ <groupId>no_group_id_given</groupId>
15
15
  <artifactId>pom_from_jarfile_with_repos</artifactId>
16
16
  <version>0.0.0</version>
17
17
  <name>pom_from_jarfile_with_repos</name>
data/spec/pom_with_execute/pom.xml CHANGED
@@ -11,7 +11,7 @@
11
11
  <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"
12
12
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
13
13
  <modelVersion>4.0.0</modelVersion>
14
- <groupId>dummy</groupId>
14
+ <groupId>no_group_id_given</groupId>
15
15
  <artifactId>pom_with_execute</artifactId>
16
16
  <version>0.0.0</version>
17
17
  <name>example with execute</name>
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: maven-tools
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.1
4
+ version: 1.0.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Christian Meier
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-06-30 00:00:00.000000000 Z
11
+ date: 2014-07-02 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: virtus
@@ -120,6 +120,7 @@ files:
120
120
  - spec/pom_with_execute/pom.xml
121
121
  - spec/gemspec/pom.xml
122
122
  - spec/gemspec_with_custom_source/pom.xml
123
+ - spec/gemfile_with_platforms/pom.xml
123
124
  - spec/gemfile_with_access_to_model/pom.xml
124
125
  - spec/gemspec_with_source/pom.xml
125
126
  - spec/gemfile_with_groups_and_lockfile/pom.xml
@@ -161,6 +162,8 @@ files:
161
162
  - spec/mavenfile/Mavenfile
162
163
  - spec/gemspec/Mavenfile
163
164
  - spec/gemspec_with_custom_source/Mavenfile
165
+ - spec/gemfile_with_platforms/Mavenfile
166
+ - spec/gemfile_with_platforms/Gemfile
164
167
  - spec/gemfile_with_access_to_model/Mavenfile
165
168
  - spec/gemfile_with_access_to_model/Gemfile
166
169
  - spec/gemspec_with_source/Mavenfile
@@ -288,6 +291,7 @@ test_files:
288
291
  - spec/pom_with_execute/pom.xml
289
292
  - spec/gemspec/pom.xml
290
293
  - spec/gemspec_with_custom_source/pom.xml
294
+ - spec/gemfile_with_platforms/pom.xml
291
295
  - spec/gemfile_with_access_to_model/pom.xml
292
296
  - spec/gemspec_with_source/pom.xml
293
297
  - spec/gemfile_with_groups_and_lockfile/pom.xml
@@ -329,6 +333,8 @@ test_files:
329
333
  - spec/mavenfile/Mavenfile
330
334
  - spec/gemspec/Mavenfile
331
335
  - spec/gemspec_with_custom_source/Mavenfile
336
+ - spec/gemfile_with_platforms/Mavenfile
337
+ - spec/gemfile_with_platforms/Gemfile
332
338
  - spec/gemfile_with_access_to_model/Mavenfile
333
339
  - spec/gemfile_with_access_to_model/Gemfile
334
340
  - spec/gemspec_with_source/Mavenfile