Merge branch 'master' of github.com:johnbintz/penchant

Merge another commit i made.

README.md

@@ -32,6 +32,9 @@ source :rubygems
 # ensure git hooks are installed when a gemfile is processed, see below
 ensure_git_hooks!
 
+# deploying to heroku and want 1.9.3 goodness?
+ruby '1.9.3'
+
 gem 'rails', '3.2.3'
 # expands to:
 #

features/ruby_gemfile.feature

@@ -411,3 +411,14 @@ Feature: Gemfiles
       gem "one"
       """
 
+  Scenario: Pass through the Ruby version
+    Given I have the file "Gemfile.penchant" with the content:
+      """
+      ruby '1.9.3'
+      """
+    When I rebuild the Gemfile for "local" mode
+    Then the file "Gemfile" should have the following content:
+      """
+      # generated by penchant, environment: local
+      ruby "1.9.3"
+      """

lib/penchant/gemfile.rb

@@ -203,6 +203,10 @@ module Penchant
         end
       end
 
+      def ruby(version)
+        @output << %{ruby "#{version}"}
+      end
+
       protected
       def args_to_string(args)
         args.inspect[1..-2]
@@ -218,9 +222,9 @@ module Penchant
         [ args, template ]
       end
 
-      def call_and_indent_output(block)
+      def call_and_indent_output(block = nil, &given_block)
         index = @output.length
-        block.call
+        (block || given_block).call
         index.upto(@output.length - 1) do |i|
           @output[i] = "  " + @output[i]
         end
@@ -270,7 +274,7 @@ module Penchant
             properties[key] = value
           end
         end
-        
+
         properties
       end
 

lib/penchant/version.rb

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