maven-tools 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b750e1a95af6fe1d7e31cba7df155f145988d12c
-  data.tar.gz: 29771d92dab94acde14863208a8fd0fed1a41283
+  metadata.gz: cb25e10235359acd7536276bae2fb121b54a7236
+  data.tar.gz: 4c37c3d8d1292711cb69d91271a31f7904fb5f56
 SHA512:
-  metadata.gz: 95e225b04bbd2626774f2cb0c7a198ed342b45b350d91d08b2247888154d32e60bc39de48bd479e211f5e667b65b4335004d8bd65c0b063de94a599d5d5dd89e
-  data.tar.gz: 231b1d90bc92d85169d89560f79baaf76afbc427db67b5bbdf39d35f5bfd6d7890493df9e5785f882952eda561083286c4b390c37f513207db04eda9bf09867b
+  metadata.gz: e27447be1c62cce5080e2987d7b2d8468cbb8adf19c85fc07bc0c02703dfda8121c78737d911db5f7d85abfc465b1582c1606fb25c8585d6f6ffcfaf27b0f02f
+  data.tar.gz: ccd6c4f02a520e416a71458b3e9efef2cee45fa88181eb7248fc0f577c721afd747ca9a7c06488c12d607ad0664751126b850fdbdaff440c73b8ad9ceffcb1bb

data/lib/maven/tools/artifact.rb

@@ -136,7 +136,7 @@ module Maven
           self[ :artifact_id ] ||= options[ :artifact_id ]
           self[ :version ] ||= options[ :version ]
           self[ :classifier ] ||= options[ :classifier ] if options[ :classifier ] 
-          self[ :exclusions ] ||= options[ :exclusions ] if options[ :exclusions ]
+          self[ :exclusions ] ||= prepare( options[ :exclusions ] ) if options[ :exclusions ]
           options.delete( :group_id )
           options.delete( :artifact_id )
           options.delete( :version )
@@ -147,6 +147,41 @@ module Maven
         end
       end
 
+      def prepare( excl )
+        excl.collect do |e|
+          case e
+          when String
+            e
+          when Array
+            e.join ':'
+          else
+            raise 'only String and Array allowed'
+          end
+        end
+      end
+      private :prepare
+      
+      ATTRS = :type=, :group_id=, :artifact_id=, :version=, :classifier=, :exclusions=, :scope=
+      def method_missing( m, arg = nil )
+        if ATTRS.member? m
+          # setter
+          self[ m.to_s[ 0..-2].to_sym ] = arg
+        elsif ATTRS.member?( "#{m}=".to_sym )
+          if arg.nil?
+            # getter
+            self[ m ]
+          else
+            # setter
+            self[ m ] = arg
+          end
+        else
+          super
+        end
+      end
+      def respond_to?( m )
+        ATTRS.member? m
+      end
+
       def gav
         [ self[:group_id], self[:artifact_id], self[:version], self[:classifier] ].select { |o| o }.join( ':' )
       end

data/lib/maven/tools/dsl.rb

@@ -286,12 +286,13 @@ module Maven
       private :setup_gem_support
 
       def setup_jruby( jruby, jruby_scope = :provided )
+        warn "deprecated: use jruby DSL directly"
         jruby ||= VERSIONS[ :jruby_version ]
 
-        if jruby.match( /-SNAPSHOT/ ) != nil
-          snapshot_repository( 'http://ci.jruby.org/snapshots/maven',
-                               :id => 'jruby-snapshots' )
-        end
+        # if jruby.match( /-SNAPSHOT/ ) != nil
+        #   snapshot_repository( 'http://ci.jruby.org/snapshots/maven',
+        #                        :id => 'jruby-snapshots' )
+        # end
         scope( jruby_scope ) do
           if ( jruby < '1.6' )
             raise 'jruby before 1.6 are not supported'
@@ -319,29 +320,25 @@ module Maven
         end
 
         if options[ :skip_locked ] or not file.exists_lock?
-          file.populate_unlocked do |dsl|
-            jarfile_dsl( dsl )
-            dsl.artifacts.each do |a|
-              _dependency a
-            end
-          end
+          dsl = file.setup_unlocked( @current )
+          # TODO this setup should be partly part of Jarfile
+          jarfile_dsl( dsl )
         else
           file.locked.each do |dep|
             artifact( dep )
           end
           file.populate_unlocked do |dsl|
+            dsl = file.setup_locked( @current )
+            # TODO this setup should be partly part of Jarfile
             jarfile_dsl( dsl )
-            dsl.artifacts.each do |a|
-              if a[ :system_path ]
-                dependeny a
-              end
+            dsl.parent.dependencies.each do |d|
+              @current.dependencies << d if d.system_path
             end
           end
         end
       end
       
       def jarfile_dsl( dsl )
-        setup_jruby( dsl.jruby )
         dsl.repositories.each do |r|
           repository r.merge( {:id => r[:name] } )
         end

data/lib/maven/tools/dsl/dependency_dsl.rb

@@ -0,0 +1,88 @@
+#
+# Copyright (C) 2014 Christian Meier
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# 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/artifact'
+require 'maven/tools/dsl/exclusions_dsl'
+module Maven
+  module Tools
+    module DSL
+      class DependencyDSL < Artifact
+        extend Options
+        include Models
+
+        class << self
+          def create( parent, type, scope, *args, &block )
+            a = DependencyDSL.from( type, *args, &block )
+            a.scope = scope if scope
+            
+            options = process_exclusions( a.model, a.dup )
+            a.instance_eval &block if block
+            fill_options( a.model, options, :type )
+            parent.dependencies << a.model
+            a
+          end
+          
+          private
+
+          def process_exclusions( dep, options )
+            exclusions = options.delete( :exclusions )
+            if exclusions && exclusions.size > 0# && dep.exclusions.size == 0
+              ExclusionsDSL.create( dep, *exclusions )
+            end
+            options
+          end
+        end
+        
+        def initialize( *args )
+          super
+          @model = Dependency.new
+        end
+        
+        def help
+          type = self[:type]
+          warn self.class.help( type, :group_id, :artifact_id, :version, :classifier, :exclusions, :scope => '{:compile|:test|:provided|:runtime}', :exclusions => nil, :exclusion => nil) + <<EOS
+argument: #{type} 'group_id:artifact_id:version'
+argument: #{type} 'group_id:artifact_id:classifier:version'
+arguments: #{type} 'group_id:artifact_id','version'
+arguments: #{type} 'group_id:artifact_id','classifier,'version'
+arguments: #{type} 'group_id','artifact_id','version'
+arguments: #{type} 'group_id','artifact_id','classifier,'version'
+EOS
+        end
+
+        def exclusions( *args, &block )
+          # TODO remove this part
+          if args.empty?
+            super
+          else
+            self[ :exclusions ] = ExclusionsDSL.create( @model, *args, &block ).to_coordinate_array
+          end
+        end
+
+        def exclusion( *args, &block )
+          e = ExclusionDSL.create( @model, *args, &block )
+          # TODO remove this part
+          self[ :exclusions ] ||= []
+          self[ :exclusions ] << e.to_coordinate
+        end
+      end
+    end
+  end
+end

data/lib/maven/tools/dsl/exclusions_dsl.rb

@@ -0,0 +1,95 @@
+#
+# Copyright (C) 2014 Christian Meier
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# 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/dsl/options'
+require 'maven/tools/dsl/models'
+module Maven
+  module Tools
+    module DSL
+      class ExclusionsDSL < Array
+        extend Options
+        def self.create( dep, *args, &block )
+          a = ExclusionsDSL.new( dep )
+          args.each do |arg|
+            a << ExclusionDSL.create( dep, *arg )
+          end
+          a.instance_eval( &block ) if block
+          a
+        end
+
+        def initialize( dep )
+          @dep = dep
+        end
+
+        def help
+          warn self.class.help( 'exclusions', :exclusion => nil ) + <<EOS
+arguments: exclusions 'group_id:artifact_id1', 'group_id:artifact_id2'
+arguments: exclusions ['group_id','artifact_id1'], ['group_id','artifact_id2']
+EOS
+        end
+
+        def exclusion( *args, &block )
+          self << ExclusionDSL.create( @dep, *args, &block )
+        end
+        
+        def to_coordinate_array
+          self.collect do |a|
+            a.to_coordinate
+          end
+        end
+      end
+
+      class ExclusionDSL
+        extend Options
+        include Models
+
+        def self.create( dep, *args, &block )
+          args, options = args_and_options( *args )
+          e = ExclusionDSL.new
+          case args.size
+          when 1
+            e.group_id, e.artifact_id = args[0].split( /:/ )
+          when 2
+            e.group_id, e.artifact_id = *args
+          end
+          e.instance_eval( &block ) if block
+          fill_options( e, options || {} )
+          dep.exclusions << e.model
+          e
+        end
+
+        def initialize
+          @model = Exclusion.new
+        end
+        
+        def help
+          warn self.class.help( 'exclusion', :group_id, :artifact_id ) + <<EOS
+argument: exclusion 'group_id:artifact_id'
+arguments: exclusion 'group_id','artifact_id'
+EOS
+        end
+
+        def to_coordinate
+          "#{@model.group_id}:#{@model.artifact_id}"
+        end
+      end
+    end
+  end
+end

data/lib/maven/tools/dsl/jarfile.rb

@@ -0,0 +1,114 @@
+#
+# Copyright (C) 2014 Christian Meier
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# 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/dsl/jruby_dsl'
+require 'maven/tools/dsl/dependency_dsl'
+module Maven
+  module Tools
+    module DSL
+      class Jarfile
+        extend Options
+
+        class Data
+          def dependencies
+            @dependencies ||= []
+          end
+        end
+
+        def artifacts
+          # TODO remove this part
+          @artifacts ||= []
+        end
+
+        def repositories
+          @repositories ||= []
+        end
+        
+        def snapshot_repositories
+          @snapshot_repositories ||= []
+        end
+
+        def initialize( file = 'Jarfile', parent = Data.new )
+          @parent = parent
+          eval( File.read( file ) )
+        end
+        attr_reader :parent
+        
+        def help
+          warn "\n# Jarfile DSL #\n"
+          warn self.class.help_block( :local => "path-to-local-jar", :jar => nil, :pom => nil, :repository => nil, :snapshot_repository => nil, :jruby => nil, :scope => nil)[0..-2]
+        end
+
+        def local( path )
+          a = Artifact.new_local( ::File.expand_path( path ), :jar )
+          dep = Dependency.new
+          self.class.fill_options( dep, a )
+          @parent.dependencies << dep
+          # TODO remove this part
+          artifacts << a
+        end
+
+        def jar( *args, &block )
+          a = DependencyDSL.create( @parent, :jar, @scope, *args, &block )
+          # TODO remove this part
+          artifacts << a
+          a
+        end
+
+        def pom( *args, &block )
+          a = DependencyDSL.create( @parent, :pom, @scope, *args, &block )
+          # TODO remove this part
+          artifacts << a
+          a
+        end
+
+        def snapshot_repository( name, url = nil )
+          if url.nil?
+            url = name
+          end
+          snapshot_repositories << { :name => name.to_s, :url => url }
+        end
+
+        def repository( name, url = nil )
+          if url.nil?
+            url = name
+          end
+          repositories << { :name => name.to_s, :url => url }
+        end
+        alias :source :repository
+
+        def scope( scope )
+          @scope = scope
+          yield if block_given?
+        ensure
+          @scope = nil
+        end
+
+        def jruby( *args, &block )
+          if args.empty? && !block
+            @jruby ? @jruby.legacy_version : nil
+          else
+            @jruby = JRubyDSL.create( @parent, :provided, *args, &block )
+          end
+        end
+      end
+    end
+  end
+end

data/lib/maven/tools/dsl/jruby_dsl.rb

@@ -0,0 +1,111 @@
+#
+# Copyright (C) 2014 Christian Meier
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# 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/dsl/options'
+require 'maven/tools/dsl/models'
+module Maven
+  module Tools
+    module DSL
+      class RepositoryDSL
+        extend Options
+        include Models
+
+        def self.create( parent, *args, &block )
+          
+        end
+      end
+      class JRubyDSL
+        extend Options
+
+        def self.create( parent, scope, *args, &block )
+          args, options = args_and_options( *args )
+          j = JRubyDSL.new( parent, scope, &block )
+          j.version args[0]
+          j.no_asm args[1]
+          fill_options( j, options || {} )
+          j.apply
+          j
+        end
+
+        def initialize( parent, scope, &block )
+          @parent = parent 
+          @data = {}
+          self.scope scope
+          self.instance_eval( &block ) if block
+        end
+
+        def dependency( type, artifact_id )
+          dep = Dependency.new
+          dep.type = type
+          dep.group_id = 'org.jruby'
+          dep.artifact_id = artifact_id
+          dep.version = version
+          dep.scope = scope
+          @parent.dependencies << dep
+        end
+        private :dependency
+
+        def apply
+          if version.nil?
+            # nothing to do
+          elsif( version < '1.6' )
+            raise 'jruby before 1.6 are not supported'
+          elsif ( version < '1.7' )
+            warn 'jruby version below 1.7 uses jruby-complete'
+            dependency :jar, 'jruby-complete'
+          elsif ( version.sub( /1\.7\./, '').to_i < 5 )
+            dependency :jar, 'jruby-core'
+          elsif no_asm
+            dependency :pom, 'jruby-noasm'
+          else
+            dependency :pom, 'jruby-noasm'
+          end
+        end
+
+        def legacy_version
+          v = version
+          v+= '-no_asm' if no_asm
+          v
+        end
+
+        def help
+          warn self.class.help( 'jruby', :scope, :version, :no_asm => true, :jar => nil ) + <<EOS
+argument: jruby 'version'
+arguments: jruby 'version', true
+EOS
+        end
+
+        def jar( *args, &block )
+          DependencyDSL.create( @parent, :jar, scope, *args, &block )
+        end
+
+        [ :scope, :version, :no_asm ].each do |meth|
+          define_method( meth ) do |arg = nil|
+            @data[ meth ] = arg if arg
+            @data[ meth ] 
+          end
+          define_method( "#{meth}=" ) do |arg|
+            @data[ meth ] = arg
+          end
+        end
+      end
+    end
+  end
+end

data/lib/maven/tools/dsl/models.rb

@@ -0,0 +1,48 @@
+#
+# Copyright (C) 2014 Christian Meier
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# 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.
+#
+module Maven
+  module Tools
+    module DSL
+      module Models
+        def model
+          @model
+        end
+
+        def respond_to?( m )
+          @model.respond_to?( m ) || @model.respond_to?( m.to_s[ 0..-2 ].to_sym )
+        end
+
+        def method_missing( m, *args )
+          if @model.respond_to? m
+            meth = @model.method m
+            if meth.arity == 0 && args.size == 1
+              @model.send( "#{m}=".to_sym, *args )
+            else
+              @model.send( m, *args )
+            end
+          else
+            super
+          end            
+        end
+      end
+    end
+  end
+end

data/lib/maven/tools/dsl/options.rb

@@ -0,0 +1,87 @@
+#
+# Copyright (C) 2014 Christian Meier
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# 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.
+#
+module Maven
+  module Tools
+    module DSL
+      module Options
+
+        def args_and_options( *args )
+          if args.last.is_a? Hash
+            [ args[0..-2], args.last ]
+          else
+            [ args, {} ]
+          end
+        end
+        
+        def fill_options( receiver, options, *allow_defaults )
+          options.each do |k,v|
+            if ! allow_defaults.member?( k ) && receiver.send( "#{k}".to_sym )
+              raise "#{receiver} has attribute #{k} already set"
+            end
+            receiver.send( "#{k}=".to_sym, v )
+          end
+        end
+
+        def help( name, *args )
+          args, options = args_and_options( *args )
+          args.each do |a|
+            options[ a ] = a.to_s if a && !options.key?( a )
+          end
+          opts = options.select{ |k,v| v }
+          t = "\n# " + name.to_s.upcase + " #\n\n"
+          unless opts.empty?
+            t += "hash options: #{name} #{opts.inspect.gsub( /\"[{]/, '(' ).gsub( /[}]\"/, ')' )}\n"
+          end
+          t += "nested: #{name} do\n"
+          t = append_nested_block( options, t )
+          t += "        end\n"
+          t
+        end
+
+        def help_block( *args )
+          args, options = help_args_and_options( *args )
+          append_nested_block( options )
+        end
+
+        private
+
+        def help_args_and_options( *args )
+          args, options = args_and_options( *args )
+          args.each do |a|
+            options[ a ] = a.to_s if a && !options.key?( a )
+          end
+          [ args, options ]
+        end
+
+        def append_nested_block( options, t = "")
+          options.each do |k,v|
+            if v
+              t += "          #{k} #{v.inspect.gsub( /\"[{]/, '(' ).gsub( /[}]\"/, ')' )}\n"
+            else
+              t += "          #{k} # nested element\n"
+            end
+          end
+          t
+        end
+      end
+    end
+  end
+end

data/lib/maven/tools/jarfile.rb

@@ -21,6 +21,8 @@
 require ::File.join(::File.dirname(__FILE__), 'coordinate.rb')
 require ::File.join(::File.dirname(__FILE__), 'artifact.rb')
 require 'fileutils'
+require 'delegate'
+require 'maven/tools/dsl/jarfile'
 module Maven
   module Tools
 
@@ -79,6 +81,7 @@ module Maven
         end
 
         def eval_file( file )
+          warn "#{self.class} is deprecated"
           if ::File.exists?( file )
             eval( ::File.read( file ), nil, file )
             self
@@ -152,10 +155,28 @@ module Maven
           
       end
 
+      class LockedParent < SimpleDelegator
+        def initialize(obj)
+          super  
+        end
+        
+        def dependencies
+          @d ||= []
+        end
+      end
+
+      def setup_unlocked( parent )
+        Maven::Tools::DSL::Jarfile.new( @file, parent )
+      end
+
+      def setup_locked( parent )
+        Maven::Tools::DSL::Jarfile.new( @file, LockedParent.new( parent ) )
+      end
+
       def populate_unlocked( container = nil, &block )
         if ::File.exists?(@file)
-          dsl = DSL.new
-          dsl.eval_file( @file )
+          dsl = Maven::Tools::DSL::Jarfile.new( @file )
+          #dsl.eval_file( @file )
 
           if block
             block.call( dsl )

data/lib/maven/tools/version.rb

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

data/spec/pom_from_jarfile/Jarfile

@@ -1,3 +1,5 @@
 jar 'junit:junit', '4.11'
 
 local './myfirst.jar'
+
+jruby :version => '1.7.13'

data/spec/pom_from_jarfile/pom.xml

@@ -16,13 +16,6 @@
   <version>0.0.0</version>
   <name>example from jarfile</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>
@@ -35,5 +28,12 @@
       <scope>system</scope>
       <systemPath>myfirst.jar</systemPath>
     </dependency>
+    <dependency>
+      <groupId>org.jruby</groupId>
+      <artifactId>jruby-noasm</artifactId>
+      <version>1.7.13</version>
+      <type>pom</type>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 </project>

data/spec/pom_from_jarfile_help_only/Jarfile

@@ -0,0 +1,13 @@
+help
+
+jar 'asd:asd' do
+ help
+ exclusions 'asd:asd' do help; end
+ exclusion do help; end
+end
+
+pom 'asd:asd' do 
+  help
+end
+
+jruby do help; end

data/spec/pom_from_jarfile_help_only/pom.rb

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

data/spec/pom_from_jarfile_help_only/pom.xml

@@ -0,0 +1,37 @@
+<?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>no_group_id_given</groupId>
+  <artifactId>pom_from_jarfile_help_only</artifactId>
+  <version>0.0.0</version>
+  <name>example from jarfile</name>
+  <dependencies>
+    <dependency>
+      <groupId>asd</groupId>
+      <artifactId>asd</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>asd</groupId>
+          <artifactId>asd</artifactId>
+        </exclusion>
+        <exclusion>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>asd</groupId>
+      <artifactId>asd</artifactId>
+      <type>pom</type>
+    </dependency>
+  </dependencies>
+</project>

data/spec/pom_from_jarfile_with_exclusions/Jarfile

@@ -0,0 +1,19 @@
+jar 'asd:asd:123' do
+  scope 'test'
+  classifier 'source'
+  exclusions 'group:a1', ['group','a2'] do
+    exclusion 'group', 'a3'
+    exclusion :artifact_id => 'a4', :group_id => 'group'
+    exclusion 'group:a5'
+    exclusion 'group' do
+      artifact_id 'a6'
+    end
+    exclusion do
+      group_id 'group'
+      artifact_id 'a7'
+    end
+  end
+end
+jar 'dsa:dsa', '12', :exclusions => ['group:b1', ['group','b2']], :classifier => 'provided' do
+  exclusion 'group:b3'
+end

data/spec/pom_from_jarfile_with_exclusions/pom.rb

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

data/spec/pom_from_jarfile_with_exclusions/pom.xml

@@ -0,0 +1,76 @@
+<?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>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>no_group_id_given</groupId>
+  <artifactId>pom_from_jarfile_with_exclusions</artifactId>
+  <version>0.0.0</version>
+  <name>example from jarfile</name>
+  <dependencies>
+    <dependency>
+      <groupId>asd</groupId>
+      <artifactId>asd</artifactId>
+      <version>123</version>
+      <classifier>source</classifier>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>group</groupId>
+          <artifactId>a1</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>group</groupId>
+          <artifactId>a2</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>group</groupId>
+          <artifactId>a3</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>group</groupId>
+          <artifactId>a4</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>group</groupId>
+          <artifactId>a5</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>group</groupId>
+          <artifactId>a6</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>group</groupId>
+          <artifactId>a7</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>dsa</groupId>
+      <artifactId>dsa</artifactId>
+      <version>12</version>
+      <classifier>provided</classifier>
+      <exclusions>
+        <exclusion>
+          <groupId>group</groupId>
+          <artifactId>b1</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>group</groupId>
+          <artifactId>b2</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>group</groupId>
+          <artifactId>b3</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+  </dependencies>
+</project>

data/spec/pom_from_jarfile_with_jruby/Jarfile

@@ -0,0 +1,5 @@
+jruby '1.7.16' do
+  no_asm true
+  scope :compile
+  jar 'joda-time:joda-time', '2.6'
+end

data/spec/pom_from_jarfile_with_jruby/pom.rb

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

data/spec/pom_from_jarfile_with_jruby/pom.xml

@@ -0,0 +1,32 @@
+<?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>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>no_group_id_given</groupId>
+  <artifactId>pom_from_jarfile_with_jruby</artifactId>
+  <version>0.0.0</version>
+  <name>example from jarfile</name>
+  <dependencies>
+    <dependency>
+      <groupId>joda-time</groupId>
+      <artifactId>joda-time</artifactId>
+      <version>2.6</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jruby</groupId>
+      <artifactId>jruby-noasm</artifactId>
+      <version>1.7.16</version>
+      <type>pom</type>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+</project>

data/spec/pom_from_jarfile_with_repos/pom.xml

@@ -16,13 +16,6 @@
   <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>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maven-tools
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Christian Meier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-08-19 00:00:00.000000000 Z
+date: 2014-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
@@ -76,6 +76,12 @@ files:
 - lib/maven/tools/jarfile.rb
 - lib/maven/tools/pom.rb
 - lib/maven/tools/coordinate.rb
+- lib/maven/tools/dsl/models.rb
+- lib/maven/tools/dsl/dependency_dsl.rb
+- lib/maven/tools/dsl/jarfile.rb
+- lib/maven/tools/dsl/jruby_dsl.rb
+- lib/maven/tools/dsl/exclusions_dsl.rb
+- lib/maven/tools/dsl/options.rb
 - spec/artifact_spec.rb
 - spec/jarfile_spec.rb
 - spec/coordinate_spec.rb
@@ -83,9 +89,11 @@ files:
 - spec/spec_helper.rb
 - spec/gemspec_dependencies_spec.rb
 - spec/gemfile_with_source/bouncy-castle-version.rb
+- spec/pom_from_jarfile_with_jruby/pom.rb
 - spec/pom_maven_style/pom.rb
 - spec/gemspec_in_profile/bouncy-castle-version.rb
 - spec/gemfile_with_lock/bouncy-castle-version.rb
+- spec/pom_from_jarfile_help_only/pom.rb
 - spec/pom_from_jarfile/pom.rb
 - spec/gemfile_include_jars/bouncy-castle-version.rb
 - spec/gemfile/bouncy-castle-version.rb
@@ -96,11 +104,13 @@ files:
 - spec/gemspec_include_jars/bouncy-castle-version.rb
 - spec/gemspec_with_extras/bouncy-castle-version.rb
 - spec/gemfile_with_extras/bouncy-castle-version.rb
+- spec/pom_from_jarfile_with_exclusions/pom.rb
 - spec/pom_maven_alternative_style/pom.rb
 - MIT-LICENSE
 - README.md
 - spec/pom.xml
 - spec/gemfile_with_source/pom.xml
+- spec/pom_from_jarfile_with_jruby/pom.xml
 - spec/gemspec_in_profile/pom.xml
 - spec/pom_from_jarfile_with_repos/pom.xml
 - spec/gemfile_with_lock/pom.xml
@@ -109,6 +119,7 @@ files:
 - spec/gemspec_with_custom_source_and_custom_jarname/pom.xml
 - spec/gemspec_prerelease_snapshot/pom.xml
 - spec/gemfile_with_path/pom.xml
+- spec/pom_from_jarfile_help_only/pom.xml
 - spec/gemfile_with_source_and_custom_jarname/pom.xml
 - spec/pom_from_jarfile/pom.xml
 - spec/gemspec_no_rubygems_repo/pom.xml
@@ -134,7 +145,9 @@ files:
 - spec/gemspec_with_extras/pom.xml
 - spec/gemspec_with_source_and_no_jar/pom.xml
 - spec/gemfile_with_extras/pom.xml
+- spec/pom_from_jarfile_with_exclusions/pom.xml
 - spec/gemfile_with_source/Mavenfile
+- spec/pom_from_jarfile_with_jruby/Jarfile
 - spec/gemspec_in_profile/Mavenfile
 - spec/pom_from_jarfile_with_repos/Jarfile
 - spec/pom_from_jarfile_with_repos/Mavenfile
@@ -147,6 +160,7 @@ files:
 - spec/gemspec_prerelease_snapshot/Mavenfile
 - spec/gemfile_with_path/Mavenfile
 - spec/gemfile_with_path/Gemfile
+- spec/pom_from_jarfile_help_only/Jarfile
 - spec/gemfile_with_source_and_custom_jarname/Mavenfile
 - spec/gemfile_with_source_and_custom_jarname/Gemfile
 - spec/pom_from_jarfile/Jarfile
@@ -184,6 +198,7 @@ files:
 - spec/gemspec_with_source_and_no_jar/Mavenfile
 - spec/gemfile_with_extras/Mavenfile
 - spec/gemfile_with_extras/Gemfile
+- spec/pom_from_jarfile_with_exclusions/Jarfile
 - spec/gemfile_with_lock/Gemfile.lock
 - spec/gemfile_with_test_group/Gemfile.lock
 - spec/gemfile_with_groups_and_lockfile/Gemfile.lock
@@ -255,9 +270,11 @@ test_files:
 - spec/spec_helper.rb
 - spec/gemspec_dependencies_spec.rb
 - spec/gemfile_with_source/bouncy-castle-version.rb
+- spec/pom_from_jarfile_with_jruby/pom.rb
 - spec/pom_maven_style/pom.rb
 - spec/gemspec_in_profile/bouncy-castle-version.rb
 - spec/gemfile_with_lock/bouncy-castle-version.rb
+- spec/pom_from_jarfile_help_only/pom.rb
 - spec/pom_from_jarfile/pom.rb
 - spec/gemfile_include_jars/bouncy-castle-version.rb
 - spec/gemfile/bouncy-castle-version.rb
@@ -268,9 +285,11 @@ test_files:
 - spec/gemspec_include_jars/bouncy-castle-version.rb
 - spec/gemspec_with_extras/bouncy-castle-version.rb
 - spec/gemfile_with_extras/bouncy-castle-version.rb
+- spec/pom_from_jarfile_with_exclusions/pom.rb
 - spec/pom_maven_alternative_style/pom.rb
 - spec/pom.xml
 - spec/gemfile_with_source/pom.xml
+- spec/pom_from_jarfile_with_jruby/pom.xml
 - spec/gemspec_in_profile/pom.xml
 - spec/pom_from_jarfile_with_repos/pom.xml
 - spec/gemfile_with_lock/pom.xml
@@ -279,6 +298,7 @@ test_files:
 - spec/gemspec_with_custom_source_and_custom_jarname/pom.xml
 - spec/gemspec_prerelease_snapshot/pom.xml
 - spec/gemfile_with_path/pom.xml
+- spec/pom_from_jarfile_help_only/pom.xml
 - spec/gemfile_with_source_and_custom_jarname/pom.xml
 - spec/pom_from_jarfile/pom.xml
 - spec/gemspec_no_rubygems_repo/pom.xml
@@ -304,7 +324,9 @@ test_files:
 - spec/gemspec_with_extras/pom.xml
 - spec/gemspec_with_source_and_no_jar/pom.xml
 - spec/gemfile_with_extras/pom.xml
+- spec/pom_from_jarfile_with_exclusions/pom.xml
 - spec/gemfile_with_source/Mavenfile
+- spec/pom_from_jarfile_with_jruby/Jarfile
 - spec/gemspec_in_profile/Mavenfile
 - spec/pom_from_jarfile_with_repos/Jarfile
 - spec/pom_from_jarfile_with_repos/Mavenfile
@@ -317,6 +339,7 @@ test_files:
 - spec/gemspec_prerelease_snapshot/Mavenfile
 - spec/gemfile_with_path/Mavenfile
 - spec/gemfile_with_path/Gemfile
+- spec/pom_from_jarfile_help_only/Jarfile
 - spec/gemfile_with_source_and_custom_jarname/Mavenfile
 - spec/gemfile_with_source_and_custom_jarname/Gemfile
 - spec/pom_from_jarfile/Jarfile
@@ -354,6 +377,7 @@ test_files:
 - spec/gemspec_with_source_and_no_jar/Mavenfile
 - spec/gemfile_with_extras/Mavenfile
 - spec/gemfile_with_extras/Gemfile
+- spec/pom_from_jarfile_with_exclusions/Jarfile
 - spec/gemfile_with_lock/Gemfile.lock
 - spec/gemfile_with_test_group/Gemfile.lock
 - spec/gemfile_with_groups_and_lockfile/Gemfile.lock