maven-tools 0.34.1 → 0.34.2

data/lib/maven/tools/artifact.rb

@@ -18,7 +18,11 @@
 # 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.
 #
-require 'maven/tools/coordinate'
+begin
+  require 'maven/tools/coordinate'
+rescue LoadError
+  # that gives an load error on jruby-maven-plugin/gem-maven-plugin ITs
+end
 module Maven
   module Tools
     class Artifact < Hash
@@ -93,6 +97,12 @@ module Maven
 
       def self.from_coordinate( coord )
         args = coord.split( /:/ )
+        # maven coordinates differ :(
+        if args.size == 5
+          classifier = args[ 4 ]
+          args[ 4 ] = args[ 3 ]
+          args[ 3 ] = classifier
+        end
         new( *args )
       end
 

data/lib/maven/tools/dsl.rb

@@ -17,6 +17,16 @@ module Maven
         @model.version = '0.0.0'
         @context = :project
         nested_block( :project, @model, block ) if block
+        if @needs_torquebox
+          if ! @model.repositories.detect { |r| r.id == 'rubygems-prereleases' }  && @model.dependencies.detect { |d| d.group_id == 'rubygems' && d.version.match( /[a-zA-Z]/ ) }
+            
+            @current = @model
+            snapshot_repository( 'http://rubygems-proxy.torquebox.org/prereleases',
+                                 :id => 'rubygems-prereleases' )
+            @current = nil
+          end
+          @needs_torquebox = nil
+        end
         result = @model
         @context = nil
         @model = nil
@@ -137,11 +147,7 @@ module Maven
             repository( 'http://rubygems-proxy.torquebox.org/releases',
                         :id => 'rubygems-releases' )
           end
-          if ! model.repositories.detect { |r| r.id == 'rubygems-prereleases' }  && model.dependencies.detect { |d| d.group_id == 'rubygems' && d.version.match( /[a-zA-Z]/ ) }
-            
-            snapshot_repository( 'http://rubygems-proxy.torquebox.org/prereleases',
-                                 :id => 'rubygems-prereleases' )
-          end
+          @needs_torquebox = true
 
           setup_jruby_plugins_version
         end
@@ -186,7 +192,7 @@ module Maven
           elsif ( jruby < '1.7.5' )
             jar 'org.jruby:jruby-core', jruby
           else
-            jar 'org.jruby:jruby', jruby
+            jar 'org.jruby:jruby-noasm', jruby
           end
         end
       end
@@ -505,17 +511,19 @@ module Maven
       end
 
       def snapshot_repository( url, options = {}, &block )
-        options[ :releases ] = false unless options.key?( :releases ) || options.key?( 'releases' )
-        options[ :snapshots ] = true unless options.key?( :snapshots ) || options.key?( 'snapshots' )
+        unless @current.respond_to? :snapshot_repository=
+            options[ :releases ] = false unless options.key?( :releases ) || options.key?( 'releases' )
+          options[ :snapshots ] = true unless options.key?( :snapshots ) || options.key?( 'snapshots' )
+        end
         do_repository( :snapshot_repository=, url, options, block )
       end
 
       def releases( config )
-        @current.releases = respository_policy( config )
+        @current.releases = repository_policy( config )
       end
 
       def snapshots( config )
-        @current.snapshots = respository_policy( config )
+        @current.snapshots = repository_policy( config )
       end
 
       def repository_policy( config )
@@ -795,9 +803,13 @@ module Maven
         else
           a = ::Maven::Tools::Artifact.from( type, *args )
         end
+        options ||= {}
         d = fill_gav( Dependency, 
                       a ? a.gav : args.join( ':' ) )
         d.type = type.to_s
+        # TODO maybe copy everything from options ?
+        d.scope = options[ :scope ] if options[ :scope ]
+        d.system_path = options[ :system_path ] if options[ :system_path ]
         d
       end
 
@@ -846,6 +858,7 @@ module Maven
           when String
             d.exclusions << fill_gav( Exclusion, exclusions )
           end
+
           options.each do |k,v|
             d.send( "#{k}=".to_sym, v ) unless d.send( k.to_sym )
           end

data/lib/maven/tools/maven_project.rb

@@ -21,6 +21,7 @@
 # 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')
+require File.join(File.dirname(__FILE__), 'coordinate.rb')
 
 module Maven
   module Tools

data/lib/maven/tools/version.rb

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

data/spec/artifact_spec.rb

@@ -3,6 +3,11 @@ require 'maven/tools/artifact'
 
 describe Maven::Tools::Artifact do
 
+  it 'should convert from coordinate' do
+    Maven::Tools::Artifact.from_coordinate( 'sdas:das:jar:tes:123' ).to_s.must_equal 'sdas:das:jar:tes:123'
+    Maven::Tools::Artifact.from_coordinate( 'sdas:das:jar:123' ).to_s.must_equal 'sdas:das:jar:123'
+  end
+
   it 'should setup artifact' do
     Maven::Tools::Artifact.new( "sdas", "das", "jar", "123", "tes" ).to_s.must_equal 'sdas:das:jar:tes:123'
     Maven::Tools::Artifact.new( "sdas", "das", "jar", "123" ).to_s.must_equal 'sdas:das:jar:123'

data/spec/pom_from_jarfile/pom.rb

@@ -0,0 +1,5 @@
+project 'example from jarfile' do
+
+  jarfile
+
+end

data/spec/pom_spec.rb

@@ -11,8 +11,8 @@ describe Maven::Tools::POM do
         pom_xml.sub!( /<!--(.|\n)*-->\n/, '' )
         pom_xml.sub!( /<?.*?>\n/, '' )
         pom_xml.sub!( /<project([^>]|\n)*>/, '<project>' )
-        
-        pom.to_s.must_equal pom_xml
+
+        pom.to_s.gsub( /#{File.expand_path( dir )}\//, '' ).must_equal pom_xml
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: maven-tools
 version: !ruby/object:Gem::Version
-  version: 0.34.1
+  version: 0.34.2
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-12-03 00:00:00.000000000 Z
+date: 2013-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
@@ -113,6 +113,7 @@ files:
 - spec/gemfile_with_source/bouncy-castle-version.rb
 - spec/pom_maven_style/pom.rb
 - spec/gemspec_in_profile/bouncy-castle-version.rb
+- spec/pom_from_jarfile/pom.rb
 - spec/gemfile_include_jars/bouncy-castle-version.rb
 - spec/gemfile/bouncy-castle-version.rb
 - spec/pom_with_execute/pom.rb