penchant 0.2.8.1 → 0.2.9

data/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"}
+      """

data/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 ]

data/lib/penchant/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: penchant
 version: !ruby/object:Gem::Version
-  version: 0.2.8.1
+  version: 0.2.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-21 00:00:00.000000000 Z
+date: 2012-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -193,7 +193,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4450964138399606364
+      hash: -1066545931225637569
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -202,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4450964138399606364
+      hash: -1066545931225637569
 requirements: []
 rubyforge_project: penchant
 rubygems_version: 1.8.23