Permalink
Browse files

Another go at making travis work

  • Loading branch information...
balvig committed Jun 2, 2012
1 parent bafee70 commit 028ca10b481a43b5ad7992850ad055752aeb703b
View
@@ -3,6 +3,3 @@ script: "rake app:db:setup && rake app:db:test:prepare && rake"
rvm:
- 1.9.2
- 1.9.3
-branches:
- only:
- - travis
View
@@ -15,9 +15,13 @@
it 'creates a new extension with a correct file structure' do
`cd #{app_path} && #{chili} new template`
- Dir.glob(File.join(template_path, "**/*")).reject { |f| File.directory?(f) }.each do |source|
- result = File.join(app_path, 'vendor/chili_template', source.sub(template_path, ''))
- File.open(result, 'rb').read.should == File.open(source, 'rb').read
+ Dir.glob(File.join(template_path, "**/*")).reject { |f| File.directory?(f) }.each do |template|
+ result = File.join(app_path, 'vendor/chili_template', template.sub(template_path, ''))
+ result_text = File.open(result, 'rb').read
+ template_text = File.open(template, 'rb').read
+ template_text.sub!('GIT_AUTHOR',`git config user.name`.chomp) # Git author is be different on each machine
+ template_text.sub!('GIT_EMAIL',`git config user.email`.chomp) # Git email is be different on each machine
+ result_text.should == template_text
end
end
end
@@ -10,4 +10,4 @@
*
*= require_self
*= require_tree .
-*/
+ */
@@ -7,16 +7,16 @@ require "chili_template/version"
Gem::Specification.new do |s|
s.name = "chili_template"
s.version = ChiliTemplate::VERSION
- s.authors = ["Jens Balvig"]
- s.email = ["jens@cookpad.com"]
+ s.authors = ["GIT_AUTHOR"]
+ s.email = ["GIT_EMAIL"]
s.homepage = ""
s.summary = "Summary of ChiliTemplate."
s.description = "Description of ChiliTemplate."
s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.rdoc"]
s.test_files = s.files.grep(%r{^(test|spec|features)/})
- s.add_dependency "rails", "~> 3.2.3"
+ s.add_dependency "rails", "~> 3.2.5"
s.add_dependency 'chili', '~> 0.2.2'
s.add_development_dependency "sqlite3"

0 comments on commit 028ca10

Please sign in to comment.