fix defaults precedence for gems

features/ruby_gemfile.feature

@@ -234,3 +234,18 @@ Feature: Gemfiles
       # generated by penchant, environment: local
       gem "one", "1.2.3", {:path=>"../one"}
       """
+
+  Scenario: Override defaults for an environment
+    Given I have the file "Gemfile.penchant" with the content:
+      """
+      defaults_for env(:local), :path => '../%s'
+      env :local do
+      gem 'one', '1.2.3', :path => '../cats'
+      end
+      """
+    When I rebuild the Gemfile for "local" mode
+    Then the file "Gemfile" should have the following content:
+      """
+      # generated by penchant, environment: local
+      gem "one", "1.2.3", {:path=>"../cats"}
+      """

lib/penchant/gemfile.rb

@@ -193,7 +193,7 @@ module Penchant
 
       def process_options(gem_name, template = {})
         Hash[
-          template.merge(_defaults_for(gem_name)).collect { |key, value|
+          _defaults_for(gem_name).dup.merge(template).collect { |key, value|
             value = value % gem_name if value.respond_to?(:%)
 
             [ key, value ]

lib/penchant/version.rb

@@ -1,3 +1,3 @@
 module Penchant
-  VERSION = "0.2.8.1"
+  VERSION = "0.2.9"
 end