penchant 0.2.23 → 0.2.24

data/features/ruby_gemfile.feature

@@ -322,6 +322,36 @@ Feature: Gemfiles
       gem "two", {:require=>nil}
       """
 
+  Scenario: Define a pair of opposites in the other order
+    Given I have the file "Gemfile.penchant" with the content:
+      """
+      opposites :local, :remote
+      defaults_for env(:local), :path => '../%s'
+
+      property(:github) { |name| { :git => "git://github.com/#{name}/%s.git" } }
+
+      env :remote do
+        gem 'one', :github => 'johnbintz', :require => nil
+      end
+      env :local do
+        gem 'two', :path => '../%s', :require => nil
+      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", {:path=>"../one", :require=>nil}
+      gem "two", {:path=>"../two", :require=>nil}
+      """
+    When I rebuild the Gemfile for "remote" mode
+    Then the file "Gemfile" should have the following content:
+      """
+      # generated by penchant, environment: remote
+      gem "one", {:git=>"git://github.com/johnbintz/one.git", :require=>nil}
+      gem "two", {:require=>nil}
+      """
+
   Scenario: Override defaults for an environment
     Given I have the file "Gemfile.penchant" with the content:
       """

data/lib/penchant/gemfile.rb

@@ -197,7 +197,10 @@ module Penchant
       def defaults_for(*args)
         defaults = args.pop
 
-        args.flatten.each { |gem| @defaults[gem.to_s] = defaults.dup }
+        args.flatten.each do |gem|
+          @defaults[gem.to_s] ||= {}
+          @defaults[gem.to_s].merge!(defaults)
+        end
       end
 
       protected

data/lib/penchant/version.rb

@@ -1,3 +1,3 @@
 module Penchant
-  VERSION = "0.2.23"
+  VERSION = "0.2.24"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: penchant
 version: !ruby/object:Gem::Version
-  version: 0.2.23
+  version: 0.2.24
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-14 00:00:00.000000000 Z
+date: 2012-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -199,7 +199,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2360032587759944188
+      hash: -3136912616894151920
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -208,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2360032587759944188
+      hash: -3136912616894151920
 requirements: []
 rubyforge_project: penchant
 rubygems_version: 1.8.23