penchant 0.2.5 → 0.2.6

data/README.md

@@ -40,19 +40,22 @@ no_deployment do
 
     dev_gems = %w{flowerbox guard-flowerbox}
 
+    # set up defaults for certain gems that are probably being used in envs
+    defaults_for dev_gems, :require => nil
+
     env :local do
       # expands to:
       #
-      # gem 'flowerbox', :path => '../flowerbox'
-      # gem 'guard-flowerbox', :path => '../guard-flowerbox'
+      # gem 'flowerbox', :path => '../flowerbox', :require => nil
+      # gem 'guard-flowerbox', :path => '../guard-flowerbox', :require => nil
       gems dev_gems, :path => '../%s'
     end
 
     env :remote do
       # expands to:
       #
-      # gem 'flowerbox', :git => 'git://github.com/johnbintz/flowerbox.git'
-      # gem 'guard-flowerbox', :git => 'git://github.com/johnbintz/guard-flowerbox.git'
+      # gem 'flowerbox', :git => 'git://github.com/johnbintz/flowerbox.git', :require => nil
+      # gem 'guard-flowerbox', :git => 'git://github.com/johnbintz/guard-flowerbox.git', :require => nil
       gems dev_gems, :git => 'git://github.com/johnbintz/%s.git'
     end
 

data/features/ruby_gemfile.feature

@@ -182,3 +182,29 @@ Feature: Gemfiles
     Then I should get the following repositories:
       | git://github.cats/two.git |
 
+  Scenario: Propose defaults for a gem
+    Given I have the file "Gemfile.penchant" with the content:
+      """
+      defaults_for 'one', :path => '../%s'
+      gem 'one', '1.2.3'
+      """
+    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=>"../one"}
+      """
+
+  @wip
+  Scenario: Propose defaults for an array of gems
+    Given I have the file "Gemfile.penchant" with the content:
+      """
+      defaults_for ['one'], :path => '../%s'
+      gem 'one', '1.2.3'
+      """
+    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=>"../one"}
+      """

data/lib/penchant/gemfile.rb

@@ -102,6 +102,7 @@ module Penchant
         @data = data
         @available_environments = []
         @defined_git_repos = []
+        @defaults = {}
       end
 
       def result(_env, _is_deployment)
@@ -129,6 +130,12 @@ module Penchant
         yield if args.include?(current_os)
       end
 
+      def defaults_for(*args)
+        defaults = args.pop
+
+        args.flatten.each { |gem| @defaults[gem.to_s] = defaults.dup }
+      end
+
       protected
       def args_to_string(args)
         args.inspect[1..-2]
@@ -154,7 +161,7 @@ module Penchant
 
       def process_options(gem_name, template = {})
         Hash[
-          template.collect { |key, value|
+          template.merge(_defaults_for(gem_name)).collect { |key, value|
             value = value % gem_name if value.respond_to?(:%)
 
             [ key, value ]
@@ -162,6 +169,10 @@ module Penchant
         ]
       end
 
+      def _defaults_for(gem_name)
+        @defaults[gem_name.to_s] || {}
+      end
+
       def current_os
         require 'rbconfig'
         case host_os = RbConfig::CONFIG['host_os']
@@ -242,7 +253,7 @@ module Penchant
 
         version = args.first
 
-        options = process_options(gem_name, template)
+        options = process_options(gem_name.first, template)
 
         args = [ gem_name.first ]
         args << version if version

data/lib/penchant/version.rb

@@ -1,3 +1,3 @@
 module Penchant
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: penchant
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-11 00:00:00.000000000 Z
+date: 2012-06-20 00:00:00.000000000 Z
 dependencies: []
 description: Things I do for my Rails projects to get up to speed in new environments
   fast
@@ -81,7 +81,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1641612638013508489
+      hash: 3133166305662926927
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -90,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1641612638013508489
+      hash: 3133166305662926927
 requirements: []
 rubyforge_project: penchant
 rubygems_version: 1.8.23