maven-tools 1.0.0.rc4 → 1.0.0.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b88274c070f020d83b32af74fdae08b890d0d118
-  data.tar.gz: fa159eb32218f2b55afbc28295a2d951f7d24ed0
+  metadata.gz: 824ec21a7dc9f640e0054c0d6169257d278a8e16
+  data.tar.gz: 2db21fe36ab4f4eaeea4c3a43bcd1e350fa7a6ef
 SHA512:
-  metadata.gz: 1230de82f0cd3b77762874d3b465f8f6eb3c3667b8e5d9c76733db31e9823728dd60eb51193e7104593ec818e2e763877094f44104612b027f51fc2bc55d82d1
-  data.tar.gz: d9e1f204daa83cfde5c71da23c1d573b93c5c9d96b251578fc13fc003c5d3c6798d2b6f737ee968ee517dfca2fa026a022e9de42044cdbf948df1d7092723e6a
+  metadata.gz: 9a633083e857fa127017fd8f65eecd835e83c87524612aae4b374dbd28685ef658d3be9f508cd308166efd1ee1f4443a5d1722107e20dac4b29f3758a78047a8
+  data.tar.gz: facb9734d8a29364479fb433f010d10eebfed726b572a6823b1266d943c712e7648b1e7efbee87ca0912dbcb7e9ae2d704c6410d6fe58b00d9b16d94ea38cefe

data/lib/maven/tools/dsl.rb

@@ -146,6 +146,10 @@ module Maven
           end
         else
           setup_gem_support( options )
+          
+          jruby_plugin!( :gem ) do
+            execute_goal :initialize
+          end
         end
 
         if pr && pr.dependencies.empty?
@@ -166,7 +170,7 @@ module Maven
 
         if @has_path or @has_git
           gem 'bundler', VERSIONS[ :bundler_version ], :scope => :provided unless gem? 'bundler'
-          jruby_plugin :gem do
+          jruby_plugin! :gem do
             execute_goal :exec, :filename => 'bundle', :args => 'install'
           end
         end
@@ -187,11 +191,19 @@ module Maven
           scope.match /#{sc}/
         end.collect { |d| d.artifact_id }
         locked.dependency_hull( names ).each do |name, version|
-          gem name, version, options unless model.artifact_id == name && model.group_id == 'rubygems'
+         gem( name, version, options ) unless has_gem( name )
         end
       end
       private :add_scoped_hull
 
+      def has_gem( name )
+        ( model.artifact_id == name && model.group_id == 'rubygems' ) ||
+          ( @current.dependencies.detect do |d|
+              d.artifact_id == name && d.group_id == 'rubygems'
+            end != nil )
+      end
+      private :has_gem
+
       def setup_gem_support( options, spec = nil, config = {} )
         unless model.properties.member?( 'project.build.sourceEncoding' )
           properties( 'project.build.sourceEncoding' => 'utf-8' )
@@ -243,6 +255,9 @@ module Maven
           plugin( :clean, VERSIONS[ :clean_plugin ],
                   :filesets => [ { :directory => output,
                                    :includes => [ "#{jar}.jar" ] } ] )
+          true
+        else
+          false
         end
       end
       private :setup_gem_support
@@ -362,22 +377,26 @@ module Maven
           authors.zip( emails ).each do |d|
             developer( :name => d[0], :email => d[1] )
           end
-          unless options[ :only_metadata ]
-            packaging 'gem'
+        end
+
+        has_jars = setup_gem_support( options, spec )
+
+        if @context == :project and not options[ :only_metadata ]
+          packaging 'gem'
+          if has_jars
+            extension 'de.saumya.mojo:gem-with-jar-extension:${jruby.plugins.version}'
+          else
             extension 'de.saumya.mojo:gem-extension:${jruby.plugins.version}'
           end
         end
 
-        setup_gem_support( options, spec )
-        
         return if options[ :only_metadata ]
 
         config = { :gemspec => name.sub( /^#{basedir}\/?/, '' ) }
         if options[ :include_jars ] || options[ 'include_jars' ] 
           config[ :includeDependencies ] = true
         end
-        plugin( 'de.saumya.mojo:gem-maven-plugin:${jruby.plugins.version}',
-                config )
+        jruby_plugin!( :gem, config )
 
         deps = nil
         if @inside_gemfile.is_a? Symbol

data/lib/maven/tools/gemfile_lock.rb

@@ -54,8 +54,8 @@ module Maven
       end
 
       def recurse(result, dep)
-        result[dep] = self[dep].version if self[dep] && !result.key?(dep)
         if d = self[dep]
+          result[dep] = d.version if  !result.key?(dep)
           d.dependencies.each do |name, version|
             unless result.key? name
               if name != 'bundler'

data/lib/maven/tools/version.rb

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

data/lib/maven/tools/versions.rb

@@ -24,7 +24,7 @@ module Maven
       VERSIONS = { 
         :jar_plugin => "2.4",
         :clean_plugin => "2.4",
-        :jruby_plugins => "1.0.1",
+        :jruby_plugins => "1.0.2",
         :bundler_version => "1.6.2",
         :jruby_version => "1.7.12",
         :tesla_version => "0.1.0"

data/spec/gemfile/pom.xml

@@ -30,7 +30,7 @@
   </scm>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.0.1</jruby.plugins.version>
+    <jruby.plugins.version>1.0.2</jruby.plugins.version>
   </properties>
   <dependencies>
     <dependency>

data/spec/gemfile_include_jars/pom.xml

@@ -30,7 +30,7 @@
   </scm>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.0.1</jruby.plugins.version>
+    <jruby.plugins.version>1.0.2</jruby.plugins.version>
   </properties>
   <dependencies>
     <dependency>

data/spec/gemfile_with_access_to_model/pom.xml

@@ -30,7 +30,7 @@
   </scm>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.0.1</jruby.plugins.version>
+    <jruby.plugins.version>1.0.2</jruby.plugins.version>
     <version_from_model>1.5.0</version_from_model>
   </properties>
   <repositories>

data/spec/gemfile_with_custom_source/pom.xml

@@ -30,7 +30,7 @@
   </scm>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.0.1</jruby.plugins.version>
+    <jruby.plugins.version>1.0.2</jruby.plugins.version>
   </properties>
   <dependencies>
     <dependency>
@@ -58,7 +58,7 @@
     <extensions>
       <extension>
         <groupId>de.saumya.mojo</groupId>
-        <artifactId>gem-extension</artifactId>
+        <artifactId>gem-with-jar-extension</artifactId>
         <version>${jruby.plugins.version}</version>
       </extension>
     </extensions>

data/spec/gemfile_with_custom_source_and_custom_jarname/pom.xml

@@ -30,7 +30,7 @@
   </scm>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.0.1</jruby.plugins.version>
+    <jruby.plugins.version>1.0.2</jruby.plugins.version>
   </properties>
   <dependencies>
     <dependency>
@@ -58,7 +58,7 @@
     <extensions>
       <extension>
         <groupId>de.saumya.mojo</groupId>
-        <artifactId>gem-extension</artifactId>
+        <artifactId>gem-with-jar-extension</artifactId>
         <version>${jruby.plugins.version}</version>
       </extension>
     </extensions>

data/spec/gemfile_with_extras/pom.xml

@@ -30,7 +30,7 @@
   </scm>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.0.1</jruby.plugins.version>
+    <jruby.plugins.version>1.0.2</jruby.plugins.version>
     <tesla.dump.pom>pom.xml</tesla.dump.pom>
     <tesla.dump.readonly>true</tesla.dump.readonly>
   </properties>

data/spec/gemfile_with_groups/pom.xml

@@ -17,7 +17,7 @@
   <name>gemfile_with_groups</name>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.0.1</jruby.plugins.version>
+    <jruby.plugins.version>1.0.2</jruby.plugins.version>
   </properties>
   <dependencies>
     <dependency>
@@ -41,4 +41,20 @@
       <url>http://rubygems-proxy.torquebox.org/releases</url>
     </repository>
   </repositories>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>de.saumya.mojo</groupId>
+        <artifactId>gem-maven-plugin</artifactId>
+        <version>${jruby.plugins.version}</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>initialize</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>

data/spec/gemfile_with_groups_and_lockfile/pom.xml

@@ -17,7 +17,7 @@
   <name>gemfile_with_groups_and_lockfile</name>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.0.1</jruby.plugins.version>
+    <jruby.plugins.version>1.0.2</jruby.plugins.version>
   </properties>
   <repositories>
     <repository>
@@ -25,6 +25,22 @@
       <url>http://rubygems-proxy.torquebox.org/releases</url>
     </repository>
   </repositories>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>de.saumya.mojo</groupId>
+        <artifactId>gem-maven-plugin</artifactId>
+        <version>${jruby.plugins.version}</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>initialize</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
   <profiles>
     <profile>
       <id>gemfile</id>

data/spec/gemfile_with_lock/pom.xml

@@ -30,7 +30,7 @@
   </scm>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.0.1</jruby.plugins.version>
+    <jruby.plugins.version>1.0.2</jruby.plugins.version>
   </properties>
   <dependencies>
     <dependency>

data/spec/gemfile_with_path/pom.xml

@@ -17,7 +17,7 @@
   <name>gemfile_with_path</name>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.0.1</jruby.plugins.version>
+    <jruby.plugins.version>1.0.2</jruby.plugins.version>
   </properties>
   <dependencies>
     <dependency>
@@ -47,6 +47,11 @@
         <artifactId>gem-maven-plugin</artifactId>
         <version>${jruby.plugins.version}</version>
         <executions>
+          <execution>
+            <goals>
+              <goal>initialize</goal>
+            </goals>
+          </execution>
           <execution>
             <goals>
               <goal>exec</goal>

data/spec/gemfile_with_source/pom.xml

@@ -30,7 +30,7 @@
   </scm>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.0.1</jruby.plugins.version>
+    <jruby.plugins.version>1.0.2</jruby.plugins.version>
   </properties>
   <dependencies>
     <dependency>
@@ -54,7 +54,7 @@
     <extensions>
       <extension>
         <groupId>de.saumya.mojo</groupId>
-        <artifactId>gem-extension</artifactId>
+        <artifactId>gem-with-jar-extension</artifactId>
         <version>${jruby.plugins.version}</version>
       </extension>
     </extensions>

data/spec/gemfile_with_source_and_custom_jarname/pom.xml

@@ -30,7 +30,7 @@
   </scm>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.0.1</jruby.plugins.version>
+    <jruby.plugins.version>1.0.2</jruby.plugins.version>
   </properties>
   <dependencies>
     <dependency>
@@ -57,7 +57,7 @@
     <extensions>
       <extension>
         <groupId>de.saumya.mojo</groupId>
-        <artifactId>gem-extension</artifactId>
+        <artifactId>gem-with-jar-extension</artifactId>
         <version>${jruby.plugins.version}</version>
       </extension>
     </extensions>

data/spec/gemfile_with_source_and_no_jar/pom.xml

@@ -30,7 +30,7 @@
   </scm>
   <properties>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-    <jruby.plugins.version>1.0.1</jruby.plugins.version>
+    <jruby.plugins.version>1.0.2</jruby.plugins.version>
   </properties>
   <dependencies>
     <dependency>

data/spec/gemfile_with_test_group/Gemfile

@@ -0,0 +1,27 @@
+#-*- mode: ruby -*-
+
+source 'https://rubygems.org'
+ruby '1.9.3', engine: 'jruby', engine_version: '1.7.12'
+
+gem 'rack',                           '~> 1.5.2'
+gem 'activerecord',                   '~> 4.1.1'
+gem 'activerecord-jdbcmysql-adapter', '~> 1.3.7'
+gem 'newrelic_rpm'
+gem 'aws-sdk',                        '~> 1.40.2'
+gem 'grape',                          '~> 0.7.0'
+
+group :test do
+  gem 'codeclimate-test-reporter',                  require: false
+  gem 'rspec-mocks',                 '~> 2.14.1'
+  gem 'rspec',                       '~> 2.14.1'
+  gem 'simplecov',                   '~> 0.8.2',    require: false
+  gem 'thor',                        '~> 0.18.1',   require: false
+  gem 'vcr',                         '~> 2.8.0'
+  gem 'webmock',                     '~> 1.16.0'
+  gem 'fake_sqs',                    '~> 0.1.0'
+  gem 'rack-test',                   '~> 0.6.2'
+  gem 'database_cleaner',            '~> 1.2.0'
+  gem 'shoulda-matchers',            '~> 2.6.1'
+end
+
+# vim: syntax=Ruby

data/spec/gemfile_with_test_group/Gemfile.lock

@@ -0,0 +1,133 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (4.1.1)
+      activesupport (= 4.1.1)
+      builder (~> 3.1)
+    activerecord (4.1.1)
+      activemodel (= 4.1.1)
+      activesupport (= 4.1.1)
+      arel (~> 5.0.0)
+    activerecord-jdbc-adapter (1.3.7)
+      activerecord (>= 2.2)
+    activerecord-jdbcmysql-adapter (1.3.7)
+      activerecord-jdbc-adapter (~> 1.3.7)
+      jdbc-mysql (>= 5.1.22)
+    activesupport (4.1.1)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    addressable (2.3.6)
+    arel (5.0.1.20140414130214)
+    aws-sdk (1.40.3)
+      json (~> 1.4)
+      nokogiri (>= 1.4.4)
+    axiom-types (0.1.1)
+      descendants_tracker (~> 0.0.4)
+      ice_nine (~> 0.11.0)
+      thread_safe (~> 0.3, >= 0.3.1)
+    builder (3.2.2)
+    codeclimate-test-reporter (0.3.0)
+      simplecov (>= 0.7.1, < 1.0.0)
+    coercible (1.0.0)
+      descendants_tracker (~> 0.0.1)
+    crack (0.4.2)
+      safe_yaml (~> 1.0.0)
+    database_cleaner (1.2.0)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.2.5)
+    docile (1.1.3)
+    equalizer (0.0.9)
+    fake_sqs (0.1.0)
+      builder
+      sinatra
+    grape (0.7.0)
+      activesupport
+      builder
+      hashie (>= 1.2.0)
+      multi_json (>= 1.3.2)
+      multi_xml (>= 0.5.2)
+      rack (>= 1.3.0)
+      rack-accept
+      rack-mount
+      virtus (>= 1.0.0)
+    hashie (2.1.1)
+    i18n (0.6.9)
+    ice_nine (0.11.0)
+    jdbc-mysql (5.1.30)
+    json (1.8.1-java)
+    mini_portile (0.5.3)
+    minitest (5.3.3)
+    multi_json (1.10.0)
+    multi_xml (0.5.5)
+    newrelic_rpm (3.8.1.221)
+    nokogiri (1.6.1-java)
+      mini_portile (~> 0.5.0)
+    rack (1.5.2)
+    rack-accept (0.4.5)
+      rack (>= 0.4)
+    rack-mount (0.8.3)
+      rack (>= 1.0.0)
+    rack-protection (1.5.3)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.6)
+    safe_yaml (1.0.3)
+    shoulda-matchers (2.6.1)
+      activesupport (>= 3.0.0)
+    simplecov (0.8.2)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
+    sinatra (1.4.5)
+      rack (~> 1.4)
+      rack-protection (~> 1.4)
+      tilt (~> 1.3, >= 1.3.4)
+    thor (0.18.1)
+    thread_safe (0.3.3-java)
+    tilt (1.4.1)
+    tzinfo (1.1.0)
+      thread_safe (~> 0.1)
+    vcr (2.8.0)
+    virtus (1.0.2)
+      axiom-types (~> 0.1)
+      coercible (~> 1.0)
+      descendants_tracker (~> 0.0.3)
+      equalizer (~> 0.0.9)
+    webmock (1.16.1)
+      addressable (>= 2.2.7)
+      crack (>= 0.3.2)
+
+PLATFORMS
+  java
+
+DEPENDENCIES
+  activerecord (~> 4.1.1)
+  activerecord-jdbcmysql-adapter (~> 1.3.7)
+  aws-sdk (~> 1.40.2)
+  codeclimate-test-reporter
+  database_cleaner (~> 1.2.0)
+  fake_sqs (~> 0.1.0)
+  grape (~> 0.7.0)
+  newrelic_rpm
+  rack (~> 1.5.2)
+  rack-test (~> 0.6.2)
+  rspec (~> 2.14.1)
+  rspec-mocks (~> 2.14.1)
+  shoulda-matchers (~> 2.6.1)
+  simplecov (~> 0.8.2)
+  thor (~> 0.18.1)
+  vcr (~> 2.8.0)
+  webmock (~> 1.16.0)