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

Merge another commit i made.
This commit is contained in:
John Bintz 2012-10-09 11:09:01 -04:00
commit f7b1cc1b9c
4 changed files with 22 additions and 4 deletions

View File

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

View File

@ -411,3 +411,14 @@ Feature: Gemfiles
gem "one" 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"
"""

View File

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

View File

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