Allow Bundler::Dependency to have multiple groups

lib/bundler/dependency.rb

@@ -7,7 +7,7 @@ class Dependency < Gem::Dependency
     def initialize(name, version, options = {}, &blk)
       super(name, version)
 
-      @group  = options["group"] || :default
+      @groups = Array(options["group"] || :default)
       @source = options["source"]
       @autorequire = options["require"] || name
       @autorequire = [@autorequire] unless @autorequire.is_a?(Array)

lib/bundler/environment.rb

@@ -61,7 +61,7 @@ def dependencies_for(*groups)
       if groups.empty?
         dependencies
       else
-        dependencies.select { |d| groups.include?(d.group) }
+        dependencies.select { |d| (groups & d.groups).any? }
       end
     end
 
@@ -172,7 +172,7 @@ def details
     end
 
     def autorequires_for_groups(*groups)
-      groups = dependencies.map { |dep| dep.group }.uniq if groups.empty?
+      groups = dependencies.map { |dep| dep.groups }.flatten.uniq if groups.empty?
       groups.inject({}) do |hash, group|
         hash[group] = dependencies_for(group).map { |dep| dep.autorequire }.flatten
         hash

lib/bundler/installer.rb

@@ -85,17 +85,17 @@ def resolve_remotely
     def group_specs(specs)
       dependencies.each do |d|
         spec = specs.find { |s| s.name == d.name }
-        group_spec(specs, spec, d.group)
+        group_spec(specs, spec, d.groups)
       end
       specs
     end
 
-    def group_spec(specs, spec, group)
-      spec.groups << group
+    def group_spec(specs, spec, groups)
+      spec.groups.concat(groups)
       spec.groups.uniq!
       spec.dependencies.select { |d| d.type != :development }.each do |d|
         spec = specs.find { |s| s.name == d.name }
-        group_spec(specs, spec, group)
+        group_spec(specs, spec, groups)
       end
     end
 

lib/bundler/rubygems.rb

@@ -17,6 +17,6 @@ def groups
   end
 
   class Dependency
-    attr_accessor :source, :group
+    attr_accessor :source, :groups
   end
 end