lib/maven/tools/dsl.rb in maven-tools-1.0.0 vs lib/maven/tools/dsl.rb in maven-tools-1.0.1

@@ -96,11 +96,11 @@
           yield
         end
       end
 
       def group( *args )
-        @group = args[ 0 ]
+        @group = args
         yield
       ensure
         @group = nil
       end
 
@@ -313,29 +313,40 @@
           file = Maven::Tools::Jarfile.new( ::File.expand_path( file ) )
         end
 
         if options[ :skip_locked ] or not file.exists_lock?
           file.populate_unlocked do |dsl|
-            setup_jruby( dsl.jruby )
+            jarfile_dsl( dsl )
             dsl.artifacts.each do |a|
               _dependency a
             end
           end
         else
           file.locked.each do |dep|
             artifact( dep )
           end
           file.populate_unlocked do |dsl|
-            setup_jruby( dsl.jruby )
+            jarfile_dsl( dsl )
             dsl.artifacts.each do |a|
               if a[ :system_path ]
                 dependeny a
               end
             end
           end
         end
       end
+      
+      def jarfile_dsl( dsl )
+        setup_jruby( dsl.jruby )
+        dsl.repositories.each do |r|
+          repository r.merge( {:id => r[:name] } )
+        end
+        dsl.snapshot_repositories.each do |r|
+          snapshot_repository r.merge( {:id => r[:name] } )
+        end
+      end
+      private :jarfile_dsl
 
       def gemspec( name = nil, options = {} )
         if @inside_gemfile == true
           @gemspec_args = [ name, options ]
           return
@@ -1267,15 +1278,15 @@
             @has_path = true
           else
             platform = options.delete( :platform ) || options.delete( 'platform' )
             group = options.delete( :group ) || options.delete( 'group' ) || @group
             if group
-               case group.to_sym
-               when :test
-                 options[ :scope ] = :test 
-               when :development
-                 options[ :scope ] = :provided
-               end
+              group = [ group ].flatten.each { |g| g.to_sym }
+              if group.member? :development
+                options[ :scope ] = :provided
+              elsif group.member? :test
+                options[ :scope ] = :test 
+              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 )
             end