[Oops] restore the << alias for Config::merge!

CocoaPods · May 27, 2012 · f06a5de · f06a5de
1 parent ea81ad7
commit f06a5de
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/lib/xcodeproj/config.rb b/lib/xcodeproj/config.rb
@@ -49,6 +49,7 @@ def includes
     def merge!(xcconfig)
       @attributes.merge!(xcconfig.to_hash) { |key, v1, v2| "#{v1} #{v2}" }
     end
+    alias_method :<<, :merge!
 
     def merge(config)
       self.dup.tap { |x|x.merge!(config) }

diff --git a/spec/config_spec.rb b/spec/config_spec.rb
@@ -50,6 +50,14 @@
     }
   end
 
+  it "merges another config hash in place with the `<<` shortcut" do
+    @config << { 'HEADER_SEARCH_PATHS' => '/some/path' }
+    @config.should == {
+      'OTHER_LD_FLAGS' => '-framework Foundation',
+      'HEADER_SEARCH_PATHS' => '/some/path'
+    }
+  end
+
   it "merges another hash in a new one" do
     new = @config.merge('HEADER_SEARCH_PATHS' => '/some/path')
     new.object_id.should.not == @config.object_id