maven-tools 0.34.5 → 1.0.0.rc2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0043d501457131717a2e0d1b85efddcabe5723c0
+  data.tar.gz: 631f64b5a850b277e3ffca5bff4ec0f2ffba265a
+SHA512:
+  metadata.gz: 455460b23c182cf47ca87631a33176befbdf815cefede9492e8a7e6b5b1c7507bd8d11fd1dc700a826315c5770414bb9e2e450485a0cc6815cf745d2ab444028
+  data.tar.gz: 11024c1588037abc38e39cc11da922c5b391c3e4c98d62456ccdd71b4cc3b7f8e32e0da7723e23d716e6e2f740e3c4d3816ad854bffcf33a6425fa6ee047804d

data/lib/maven/tools/artifact.rb

@@ -32,7 +32,7 @@ module Maven
       end
 
       def self.new_local( path, type, options = {} )
-        name = File.basename( path ).sub( /.#{type}$/, '' )
+        name = ::File.basename( path ).sub( /.#{type}$/, '' )
         if ind = name.rindex( '-' )
           version = name[ind + 1..-1]
           name = name[0..ind - 1]
@@ -77,18 +77,24 @@ module Maven
           # jar "asd:Asd:[dsa:rew,fe:fer]",'>123', '<345'
           # jar "asd:Asd:test:[dsa:rew,fe:fer]",'>123', '<345'
           # jar "asd:Asd:test:[dsa:rew,fe:fer]", '123', 'source'
-          v = helper.to_version( *args[1..-1] )
-          case v
-          when String
-            group_id, artifact_id, classifier, exclusions = args[0].split( /:/ )
-            self.new( group_id, artifact_id, type,
-                      v, classifier, exclusions,
-                      options )
+          if args[ 0 ].match /:/
+            v = helper.to_version( *args[1..-1] )         
+            case v
+            when String
+              group_id, artifact_id, classifier, exclusions = args[0].split( /:/ )
+              self.new( group_id, artifact_id, type,
+                        v, classifier, exclusions,
+                        options )
+            else
+              group_id, artifact_id = args[0].split( /:/ )
+              self.new( group_id, artifact_id, type,
+                        args[1], args[2], nil,
+                        options )
+            end
           else
-            group_id, artifact_id = args[0].split( /:/ )
-            self.new( group_id, artifact_id, type,
-                      args[1], args[2], nil,
-                      options )
+            self.new( args[ 0 ], args[ 1 ], type,
+                      args[ 2 ], nil, nil,
+                      options )            
           end
         else
           nil

data/lib/maven/tools/dsl.rb

@@ -3,6 +3,7 @@ require 'maven/tools/gemspec_dependencies'
 require 'maven/tools/artifact'
 require 'maven/tools/jarfile'
 require 'maven/tools/versions'
+require 'maven/tools/gemfile_lock'
 
 module Maven
   module Tools
@@ -11,7 +12,7 @@ module Maven
       def tesla( &block )
         @model = Model.new
         @model.model_version = '4.0.0'
-        @model.name = File.basename( basedir )
+        @model.name = ::File.basename( basedir )
         @model.group_id = 'dummy'
         @model.artifact_id = model.name
         @model.version = '0.0.0'
@@ -21,8 +22,8 @@ module Maven
           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' )
+            snapshot_repository(  'rubygems-prereleases',
+                                  'http://rubygems-proxy.torquebox.org/prereleases' )
             @current = nil
           end
           @needs_torquebox = nil
@@ -47,19 +48,19 @@ module Maven
 
       def eval_pom( src, reference_file = '.' )
         @source = reference_file
-        eval( src )
+        eval( src, nil, ::File.expand_path( @source ) )
       ensure
         @source = nil
         @basedir = nil
       end
 
       def basedir( basedir = nil )
-        @basedir ||= basedir if basedir
+        @basedir = basedir if basedir
         if @source
-          @basedir ||= File.directory?( @source ) ? @source : 
-            File.dirname( File.expand_path( @source ) )
+          @basedir ||= ::File.directory?( @source ) ? @source : 
+            ::File.dirname( ::File.expand_path( @source ) )
         end
-        @basedir ||= File.expand_path( '.' )
+        @basedir ||= ::File.expand_path( '.' )
       end
 
       def artifact( a )
@@ -108,19 +109,54 @@ module Maven
           options = name
           name = 'Gemfile'
         end
-        name = File.join( basedir, name ) unless File.exists?( name )
-        basedir = File.dirname( name ) unless basedir
+        name = ::File.join( basedir, name ) unless ::File.exists?( name )
+        basedir = ::File.dirname( name ) unless basedir
 
-        @gemfile_options = options
-        FileUtils.cd( basedir ) do
-          eval( File.read( File.expand_path( name ) ) )
+        @inside_gemfile = true
+        # the eval might need those options for gemspec declaration
+        pr = profile :gemfile do
+          activation do
+            file( :missing => name + '.lock' )
+          end
+
+          FileUtils.cd( basedir ) do
+            f = ::File.expand_path( name )
+            eval( ::File.read( f ), nil, f )
+          end
         end
 
-        if @gemfile_options
-          @gemfile_options = nil
+        if @gemspec_args
+          @inside_gemfile = :gemfile
+          case @gemspec_args[ 0 ]
+          when Hash
+            gemspec( @gemspec_args[ 0 ].merge( options ) )
+          when NilClass
+            gemspec( @gemspec_args[ 0 ], options )
+          else
+            @gemspec_args[ 1 ].merge!( options ) 
+            gemspec( *@gemspec_args )
+          end
+        else
           setup_gem_support( options )
         end
 
+        if pr.dependencies.empty?
+          @current.profiles.delete( pr )
+        end
+
+        lockfile = ::File.expand_path( name + '.lock' )
+        if File.exists? lockfile
+          profile :gemfile_lock do
+            activation do
+              file( :exists => name + '.lock' )
+            end
+            locked = GemfileLock.new( lockfile )
+            locked.hull.each do |name, version|
+              gem name, version unless model.artifact_id == name && model.group_id == 'rubygems'
+            end
+          end
+        end
+
         if @has_path or @has_git
           gem 'bundler', :scope => :provided unless gem? 'bundler'
           jruby_plugin :gem do
@@ -128,17 +164,16 @@ module Maven
           end
         end
       ensure
+        @inside_gemfile = nil
+        @gemspec_args = nil
         @has_path = nil
         @has_git = nil
       end
 
       def setup_gem_support( options, spec = nil, config = {} )
-        unless model.properties.member?( 'project.build.sourceEncoding' )
-          properties( 'project.build.sourceEncoding' => 'utf-8' )
-        end
         if spec.nil?
           require_path = '.'
-          name = File.basename( File.expand_path( '.' ) )
+          name = ::File.basename( ::File.expand_path( '.' ) )
         else
           require_path = spec.require_path
           name = spec.name
@@ -147,8 +182,8 @@ module Maven
         unless options[ :only_metadata ]
         
           unless model.repositories.detect { |r| r.id == 'rubygems-releases' }
-            repository( 'http://rubygems-proxy.torquebox.org/releases',
-                        :id => 'rubygems-releases' )
+            repository( 'rubygems-releases',
+                        'http://rubygems-proxy.torquebox.org/releases' )
           end
           @needs_torquebox = true
 
@@ -158,8 +193,8 @@ module Maven
         if options.key?( :jar ) || options.key?( 'jar' )
           jarpath = options[ :jar ] || options[ 'jar' ]
           if jarpath
-            jar = File.basename( jarpath ).sub( /.jar$/, '' )
-            output = File.dirname( "#{require_path}/#{jarpath}" )
+            jar = ::File.basename( jarpath ).sub( /.jar$/, '' )
+            output = ::File.dirname( "#{require_path}/#{jarpath}" )
             output.sub!( /\/$/, '' )
           end
         else
@@ -173,7 +208,7 @@ module Maven
           end
         end
         if jar && ( source || 
-                    File.exists?( File.join( basedir, 'src', 'main', 'java' ) ) )
+                    ::File.exists?( ::File.join( basedir, 'src', 'main', 'java' ) ) )
           plugin( :jar, VERSIONS[ :jar_plugin ],
                   :outputDirectory => output,
                   :finalName => jar ) do
@@ -194,19 +229,21 @@ module Maven
                                :id => 'jruby-snapshots' )
         end
         scope( jruby_scope ) do
-          if jruby < '1.7'
+          if ( jruby < '1.6' )
+            raise 'jruby before 1.6 are not supported'
+          elsif ( jruby < '1.7' )
             warn 'jruby version below 1.7 uses jruby-complete'
             jar 'org.jruby:jruby-core', jruby
-          elsif jruby.sub( /1\.7\./, '').to_i < 5
+          elsif ( jruby.sub( /1\.7\./, '').to_i < 5 )
             jar 'org.jruby:jruby-core', jruby
           elsif jruby =~ /-no_asm$/
             pom 'org.jruby:jruby-noasm', jruby.sub( /-no_asm$/, '' )
-           else
+          else
             pom 'org.jruby:jruby', jruby
           end
         end
       end
-      #private :setup_jruby
+      private :setup_jruby
       
       def jarfile( file = 'Jarfile', options = {} )
         if file.is_a? Hash 
@@ -214,7 +251,7 @@ module Maven
           file = 'Jarfile'
         end
         unless file.is_a?( Maven::Tools::Jarfile )
-          file = Maven::Tools::Jarfile.new( File.expand_path( file ) )
+          file = Maven::Tools::Jarfile.new( ::File.expand_path( file ) )
         end
 
         if options[ :skip_locked ] or not file.exists_lock?
@@ -239,28 +276,33 @@ module Maven
         end
       end
 
-      def gemspec( name = nil, options = @gemfile_options || {} )
+      def gemspec( name = nil, options = {} )
+        if @inside_gemfile == true
+          @gemspec_args = [ name, options ]
+          return
+        end
         if name.is_a? Hash
           options = name
           name = nil
         end
         if name
-          name = File.join( basedir, name )
+          name = ::File.join( basedir, name )
         else name
-          gemspecs = Dir[ File.join( basedir, "*.gemspec" ) ]
+          gemspecs = Dir[ ::File.join( basedir, "*.gemspec" ) ]
           raise "more then one gemspec file found" if gemspecs.size > 1
           raise "no gemspec file found" if gemspecs.size == 0
           name = gemspecs.first
         end
         spec = nil
-        spec_file = File.read( File.expand_path( name ) )
+        f = ::File.expand_path( name )
+        spec_file = ::File.read( f )
         begin
+          spec = Gem::Specification.from_yaml( spec_file )
+        rescue Gem::Exception
           FileUtils.cd( basedir ) do
             # TODO jruby java user.dir
-            spec = eval( spec_file )
+            spec = eval( spec_file, nil, f )
           end
-        rescue
-          spec = Gem::Specification.from_yaml( spec_file )
         end
         
         self.spec( spec, name, options )
@@ -268,6 +310,9 @@ module Maven
 
       def spec( spec, name = nil, options = {} )
         name ||= "#{spec.name}-#{spec.version}.gemspec"
+        unless model.properties.member?( 'project.build.sourceEncoding' )
+          properties( 'project.build.sourceEncoding' => 'utf-8' ) 
+        end
 
         @gemfile_options = nil
 
@@ -295,7 +340,24 @@ module Maven
         end
         plugin( 'de.saumya.mojo:gem-maven-plugin:${jruby.plugins.version}',
                 config )
+
+        deps = nil
+        if @inside_gemfile
+          profile! @inside_gemfile do
+            deps = all_deps( spec )
+          end
+        else
+          deps = all_deps( spec )
+        end
         
+        unless deps.java_runtime.empty?
+          deps.java_runtime.each do |d|
+            dependency Maven::Tools::Artifact.new( *d )
+          end
+        end
+      end
+
+      def all_deps( spec )
         deps = Maven::Tools::GemspecDependencies.new( spec )
         deps.runtime.each do |d|
           gem d
@@ -307,12 +369,9 @@ module Maven
             end          
           end
         end
-        unless deps.java_runtime.empty?
-          deps.java_runtime.each do |d|
-            dependency Maven::Tools::Artifact.new( *d )
-          end
-        end
+        deps
       end
+      private :all_deps
 
       def build( &block )
         build = @current.build ||= Build.new
@@ -368,29 +427,81 @@ module Maven
         end
       end
 
-      def site( url = nil, options = {} )
+      def site( *args, &block )
         site = Site.new
-        options.merge!( :url => url )
+        args, options = args_and_options( *args )
+        site.id = args[ 0 ]
+        site.url = args[ 1 ]
+        site.name = args[ 2 ]
         fill_options( site, options )
+        nested_block( :site, site, block) if block
         @current.site = site
       end
 
-      def source_control( url = nil, options = {} )
+      def source_control( *args, &block )
         scm = Scm.new
-        options.merge!( :url => url )
+        args, options = args_and_options( *args )
+        scm.connection = args[ 0 ]
+        scm.developer_connection = args[ 1 ]
+        scm.url = args[ 2 ]
         fill_options( scm, options )
+        nested_block( :scm, scm, block ) if block
         @current.scm = scm
       end
       alias :scm :source_control
 
-      def issue_management( url, system = nil )
+      def issue_management( *args, &block )
         issues = IssueManagement.new
-        issues.url = url
-        issues.system = system
+        args, options = args_and_options( *args )
+        issues.url = args[ 0 ]
+        fill_options( issues, options )
+        nested_block( :issue_management, issues, block ) if block
         @current.issue_management = issues
-        issues
+      end
+      alias :issues :issue_management
+
+      def ci_management( *args, &block )
+        ci = CiManagement.new
+        args, options = args_and_options( *args )
+        ci.url = args[ 0 ]
+        fill_options( ci, options )
+        nested_block( :ci_management, ci, block ) if block
+        @current.ci_management = ci
+      end
+      alias :ci :ci_management
+
+      def distribution_management( *args, &block )
+        di = DistributionManagement.new
+        args, options = args_and_options( *args )
+        di.status = args[ 0 ]
+        di.download_url = args[ 1 ]
+        fill_options( di, options )
+        nested_block( :distribution_management, di, block ) if block
+        @current.distribution_management = di
       end
 
+      def relocation( *args, &block )
+        args, options = args_and_options( *args )
+        relocation = fill_gav( Relocation, args.join( ':' ) )
+        fill_options( relocation, options )
+        nested_block( :relocation, relocation, block ) if block
+        @current.relocation = relocation
+      end
+
+      def system( arg )
+        @current.system = arg
+      end
+
+      def notifier( *args, &block )
+        n = Notifier.new
+        args, options = args_and_options( *args )
+        n.type = args[ 0 ]
+        n.address = args[ 1 ]
+        fill_options( n, options )
+        nested_block( :notifier, n, block ) if block
+        @current.notifiers <<  n
+        n
+      end
       def mailing_list( *args, &block )
         list = MailingList.new
         args, options = args_and_options( *args )
@@ -468,16 +579,15 @@ module Maven
         @current.activation = activation
       end
 
-      def distribution( val = nil, &block )
+      def distribution( *args, &block )
         if @context == :license
-          @current.distribution = val
+          args, options = args_and_options( *args )
+          @current.distribution = args[ 0 ]
+          fill_options( @current, options )
         else
-          dist = DistributionManagement.new
-          nested_block( :distribution, dist, block ) if block
-          @current.distribution_management = dist
+          distribution_management( *args, &block )
         end
       end
-      alias :distribution_management :distribution
 
       def includes( *items )
         @current.includes = items.flatten
@@ -487,11 +597,12 @@ module Maven
         @current.excludes = items.flatten
       end
 
-      def test_resource( &block )
+      def test_resource( options = {}, &block )
         # strange behaviour when calling specs from Rakefile
         return if @current.nil?
-        resource = Resource.new
-        nested_block( :resource, resource, block ) if block
+        resource = TestResource.new
+        fill_options( resource, options )
+        nested_block( :test_resource, resource, block ) if block
         if @context == :project
           ( @current.build ||= Build.new ).test_resources << resource
         else
@@ -499,8 +610,9 @@ module Maven
         end
       end
 
-      def resource( &block )
+      def resource( options = {}, &block )
         resource = Resource.new
+        fill_options( resource, options )
         nested_block( :resource, resource, block ) if block
         if @context == :project
           ( @current.build ||= Build.new ).resources << resource
@@ -509,44 +621,59 @@ module Maven
         end
       end
 
-      def repository( url, options = {}, &block )
-        do_repository( :repository=, url, options, block )
+      def repository( *args, &block )
+        do_repository( :repository=, *args, &block )
+      end
+
+      def plugin_repository( *args, &block )
+        do_repository( :plugin, *args, &block )
       end
 
-      def plugin_repository( url, options = {}, &block )
-        do_repository( :plugin, url, options, block )
+      def set_policy( key, enable, options )
+        return unless options
+        if map = options[ key ] || options[ key.to_s ]
+          map[ :enabled ] = enable
+        else
+          options[ key ] = enable
+        end
       end
+      private :set_policy
 
-      def snapshot_repository( url, options = {}, &block )
-        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' )
+      def snapshot_repository( *args, &block )
+        unless @current.respond_to?( :snapshot_repository= )
+          args, options = args_and_options( *args )
+          set_policy( :releases, false, options )
+          set_policy( :snapshots, true, options )
+          args << options
         end
-        do_repository( :snapshot_repository=, url, options, block )
+        do_repository( :snapshot_repository=, *args, &block )
       end
 
-      def releases( config )
-        @current.releases = repository_policy( config )
+      def releases( config = nil, &block )
+        @current.releases = repository_policy( @current.releases,
+                                               config, &block )
       end
 
-      def snapshots( config )
-        @current.snapshots = repository_policy( config )
+      def snapshots( config = nil, &block)
+        @current.snapshots = repository_policy( @current.snapshots,
+                                                config, &block )
       end
 
-      def repository_policy( config )
-        rp = RepositoryPolicy.new
+      def repository_policy( rp, config, &block )
+        rp ||= RepositoryPolicy.new
         case config
         when Hash
-          rp.enabled = config[ :enabled ]
-          rp.update_policy = config[ :update ]
-          rp.checksum_policy = config[ :checksum ]
+          rp.enabled = config[ :enabled ] unless config[ :enabled ].nil?
+          rp.update_policy = config[ :update ] || config[ :update_policy ] 
+          rp.checksum_policy = config[ :checksum ] || config[ :checksum_policy ]
         when TrueClass
           rp.enabled = true
         when FalseClass
           rp.enabled = false
         else
-          rp.enabled = 'true' == config
+          rp.enabled = 'true' == config unless config.nil?
         end
+        nested_block( :repository_policy, rp, block ) if block
         rp
       end
 
@@ -594,14 +721,26 @@ module Maven
         @current.properties
       end
 
-      def extension( *gav )
-        @current.build ||= Build.new
-        gav = gav.join( ':' )
-        ext = fill_gav( Extension, gav)
-        @current.build.extensions << ext
+      def extension( *args )
+        build = if @context == :build
+                  @current
+                else
+                  @current.build ||= Build.new
+                end
+        args, options = args_and_options( *args )
+        ext = fill_gav( Extension, args.join( ':' ) )
+        fill_options( ext, options )
+        build.extensions << ext
         ext
       end
 
+      def exclusion( *gav )
+        gav = gav.join( ':' )
+        ex = fill_gav( Extension, gav)
+        @current.exclusions << ex
+        ex
+      end
+
       def setup_jruby_plugins_version
         unless @current.properties.key?( 'jruby.plugins.version' )
           properties( 'jruby.plugins.version' => VERSIONS[ :jruby_plugins ] )
@@ -706,7 +845,7 @@ module Maven
           end
           options[ :taskId ] = options[ :id ] || options[ 'id' ]
           if @source
-            options[ :nativePom ] = File.expand_path( @source ).sub( /#{basedir}./, '' )
+            options[ :nativePom ] = ::File.expand_path( @source ).sub( /#{basedir}./, '' )
           end
 	  
           add_execute_task( options, &block )
@@ -766,12 +905,12 @@ module Maven
         exec
       end
 
-      def dependency( type, *args )
-        do_dependency( false, type, *args )
+      def dependency( type, *args, &block )
+        do_dependency( false, type, *args, &block )
       end
 
-      def dependency!( type, *args )
-        do_dependency( true, type, *args )
+      def dependency!( type, *args, &block )
+        do_dependency( true, type, *args, &block )
       end
 
       def dependency?( type, *args )
@@ -808,6 +947,7 @@ module Maven
           type = a[ :type ]
           options = a
         else
+          args, options = args_and_options( *args )
           a = ::Maven::Tools::Artifact.from( type, *args )
         end
         options ||= {}
@@ -817,6 +957,7 @@ module Maven
         # 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
 
@@ -824,12 +965,14 @@ module Maven
         if @context == :overrides
           @current.dependency_management ||= DependencyManagement.new
           @current.dependency_management.dependencies
+        #elsif @context == :build
+        #  @current.
         else
           @current.dependencies
         end
       end
 
-      def do_dependency( bang, type, *args )
+      def do_dependency( bang, type, *args, &block )
         d = retrieve_dependency( type, *args )
         container = dependency_container
 
@@ -843,10 +986,9 @@ module Maven
         else
           container << d
         end
+        
+        args, options = args_and_options( *args )
 
-        if args.last.is_a?( Hash )
-          options = args.last
-        end
         if options || @scope
           options ||= {}
           if @scope
@@ -860,7 +1002,10 @@ module Maven
           case exclusions
           when Array
             exclusions.each do |v|
-              d.exclusions << fill_gav( Exclusion, v )
+              v, opts = args_and_options( v )
+              ex = fill_gav( Exclusion, *v )
+              fill_options( ex, opts )
+              d.exclusions << ex
             end
           when String
             d.exclusions << fill_gav( Exclusion, exclusions )
@@ -870,13 +1015,18 @@ module Maven
             d.send( "#{k}=".to_sym, v ) unless d.send( k.to_sym )
           end
         end
+        nested_block( :dependency, d, block ) if block
         d
       end
 
       def scope( name )
-        @scope = name
-        yield
-        @scope = nil
+        if @context == :dependency
+          @current.scope = name
+        else
+          @scope = name
+          yield
+          @scope = nil
+        end
       end
 
       def phase( name )
@@ -885,11 +1035,22 @@ module Maven
         @phase = nil
       end
 
+      def profile!( id, &block )
+        profile = @current.profiles.detect { |p| p.id.to_s == id.to_s }
+        if profile
+          nested_block( :profile, profile, block ) if block
+          profile
+        else
+          profile( id, &block )
+        end
+      end
+
       def profile( id, &block )
         profile = Profile.new
         profile.id = id if id
         @current.profiles << profile
         nested_block( :profile, profile, block ) if block
+        profile
       end
 
       def report_set( *reports, &block )
@@ -942,12 +1103,7 @@ module Maven
         end
         if args.last.is_a?(Hash)
           options = args.last
-        elsif @group
-          options = {}
-          args << options
-        end
-        if options
-
+          
           # on ruby-maven side we ignore the require option
           options.delete( :require )
           options.delete( 'require' )
@@ -958,15 +1114,15 @@ module Maven
             @has_path = true
           else
             platform = options.delete( :platform ) || options.delete( 'platform' )
-            group = options.delete( :group ) || options.delete( 'group' ) || @group
-            if group
+            group = options.delete( :group ) || options.delete( 'group' ) || @group || nil
+             if group
                case group.to_sym
                when :test
                  options[ :scope ] = :test 
                when :development
                  options[ :scope ] = :provided
                end
-            end
+             end
             if platform.nil? || is_jruby_platform( platform )
               options[ :version ] = '[0,)' if args.size == 2 && options[ :version ].nil? && options[ 'version' ].nil?
               do_dependency( bang, :gem, *args )
@@ -979,7 +1135,7 @@ module Maven
       end
 
       def local( path, options = {} )
-        path = File.expand_path( path )
+        path = ::File.expand_path( path )
         dependency( :jar,
                     Maven::Tools::Artifact.new_local( path, :jar, options ) )
       end
@@ -1016,26 +1172,28 @@ module Maven
             end
             @current
           else
-            if ( args.size > 0 &&
-                 args[0].is_a?( String ) &&
-                 args[0] =~ /^[${}0-9a-zA-Z._-]+(:[${}0-9a-zA-Z._-]+)+$/ ) ||
-                ( args.size == 1 && args[0].is_a?( Hash ) )
-              mm = method.to_s
-              case mm[ (mm.size - 1)..-1 ]
+            begin
+            # if ( args.size > 0 &&
+            #      args[0].is_a?( String ) &&
+            #      args[0] =~ /^[${}0-9a-zA-Z._-]+(:[${}0-9a-zA-Z._-]+)+$/ ) ||
+            #     ( args.size == 1 && args[0].is_a?( Hash ) )
+              case method.to_s[ -1 ]
               when '?'
-                dependency?( method.to_s[0..-2].to_sym, *args )
+                dependency?( method.to_s[0..-2].to_sym, *args, &block )
               when '!'
-                dependency!( method.to_s[0..-2].to_sym, *args )
+                dependency!( method.to_s[0..-2].to_sym, *args, &block  )
               else
-                dependency( method, *args )
+                dependency( method, *args, &block )
               end
               # elsif @current.respond_to? method
               #   @current.send( method, *args )
               #   @current
-            else
+#            else
+            rescue => e
               p @context
               p m
               p args
+              raise e
             end
           end
         else
@@ -1053,7 +1211,8 @@ module Maven
 
       private
 
-      def do_repository( method, url = nil, options = {}, block = nil )
+      def do_repository( method, *args, &block )
+        args, options = args_and_options( *args )
         if @current.respond_to?( method )
           r = DeploymentRepository.new
         else
@@ -1061,17 +1220,19 @@ module Maven
           c = options.delete( :snapshots )
           c = options.delete( 'snapshots' ) if c.nil?
           unless c.nil?
-            r.snapshots = repository_policy( c )
+            r.snapshots = repository_policy( r.snapshots, c )
           end
           c = options.delete( :releases )
           c = options.delete( 'releases' ) if c.nil?
           unless c.nil?
-            r.releases = repository_policy( c )
+            r.releases = repository_policy( r.releases, c )
           end
         end
-        nested_block( :repository, r, block ) if block
-        options.merge!( :url => url )
+        r.id = args[ 0 ]
+        r.url = args[ 1 ]
+        r.name = args[ 2 ]
         fill_options( r, options )
+        nested_block( :repository, r, block ) if block
         case method
         when :plugin
           @current.plugin_repositories << r