penchant 0.2.9 → 0.2.10

data/README.md

@@ -2,7 +2,8 @@
 
 I like to do these things in all my projects:
 
-* Have all my tests run before committing. I don't like buying ice cream for the team on test failures.
+* Have all my tests run before committing. I don't like buying ice cream for the team on test failures, and setting up internal 
+  CI for smaller projects is a pain.
 * If I'm developing gems alongside this project, I use a `Gemfile.penchant` to get around the "one gem, one source" issue in
   current versions of Bundler.
 * I can also factor out and simplify a lot of my Gemfile settings.
@@ -45,12 +46,15 @@ no_deployment do
     # set up defaults for certain gems that are probably being used in envs
     defaults_for dev_gems, :require => nil
 
+    # set up defaults for all gems in a particular environment
+    defaults_for env(:local), :path => '../%s' # the %s is the name of the gem
+
     env :local do
       # expands to:
       #
       # gem 'flowerbox', :path => '../flowerbox', :require => nil
       # gem 'guard-flowerbox', :path => '../guard-flowerbox', :require => nil
-      gems dev_gems, :path => '../%s' # the %s is the name of the gem
+      gems dev_gems
     end
 
     env :remote do
@@ -77,7 +81,8 @@ end
 Use `script/gemfile local` to get at the local ones, and `script/gemfile remote` to get at the remote ones.
 It then runs `bundle install`.
 
-You can also run `penchant gemfile ENV`.
+You can also run `penchant gemfile ENV`. Just straight `penchant gemfile` will rebuild the `Gemfile` from
+`Gemfile.penchant` for whatever environment the `Gemfile` is currently using.
 
 ### Deployment mode
 
@@ -87,6 +92,8 @@ and deploying on another, or if you don't want to deal with the dependencies for
 frameworks:
 
 ``` ruby
+gem 'rails'
+
 no_deployment do
   os :darwin do
     gems 'growl_notify', 'growl', 'rb-fsevent'
@@ -128,6 +135,9 @@ env :remote do
 end
 ```
 
+Note that this just does a quick `git clone`, so if your project is already in there in a different state,
+nothing "happens" except that git fails.
+
 ## initialize-environment
 
 Get new developers up to speed fast! `script/initialize-environment` does the following when run:

data/features/ruby_gemfile.feature

@@ -249,3 +249,17 @@ Feature: Gemfiles
       # generated by penchant, environment: local
       gem "one", "1.2.3", {:path=>"../cats"}
       """
+
+  Scenario: Define special expansions for properties
+    Given I have the file "Gemfile.penchant" with the content:
+      """
+      defaults_for env(:local), :path => '../%s'
+      property(:github) { |name| { :git => "git://github.com/#{name}/%s.git" } }
+      gem 'one', :github => 'john'
+      """
+    When I rebuild the Gemfile for "local" mode
+    Then the file "Gemfile" should have the following content:
+      """
+      # generated by penchant, environment: local
+      gem "one", {:git=>"git://github.com/john/one.git"}
+      """

data/lib/penchant/gemfile.rb

@@ -121,6 +121,7 @@ module Penchant
         @available_environments = []
         @defined_git_repos = []
         @defaults = {}
+        @properties = {}
 
         @_current_env_defaults = {}
       end
@@ -150,6 +151,10 @@ module Penchant
         end
       end
 
+      def property(name, &block)
+        @properties[name] = block
+      end
+
       def for_environment?(envs)
         envs.include?(environment) || environment == ANY_ENVIRONMENT
       end
@@ -192,13 +197,25 @@ module Penchant
       end
 
       def process_options(gem_name, template = {})
-        Hash[
-          _defaults_for(gem_name).dup.merge(template).collect { |key, value|
+        properties = {}
+
+        property_stack = _defaults_for(gem_name).dup.merge(template).to_a
+
+        while !property_stack.empty?
+          key, value = property_stack.shift
+
+          if @properties[key]
+            @properties[key].call(*([ value ].flatten)).each do |k, v|
+              property_stack.push([ k, v ])
+            end
+          else
             value = value % gem_name if value.respond_to?(:%)
 
-            [ key, value ]
-          }.sort
-        ]
+            properties[key] = value
+          end
+        end
+
+        Hash[properties.sort]
       end
 
       def _defaults_for(gem_name)

data/lib/penchant/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: penchant
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-03 00:00:00.000000000 Z
+date: 2012-07-05 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: -1066545931225637569
+      hash: -1638831436357911283
 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: -1066545931225637569
+      hash: -1638831436357911283
 requirements: []
 rubyforge_project: penchant
 rubygems_version: 1.8.23