Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for git:// URLs for templates. #314

Merged
merged 1 commit into from
Aug 3, 2012
Merged

Add support for git:// URLs for templates. #314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 27 additions & 9 deletions lib/veewee/definitions.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
require 'grit'
require 'veewee/definition'
require 'veewee/templates'
require 'veewee/template'
Expand Down Expand Up @@ -39,7 +40,7 @@ def each(&block)
end

if definitions.length==0
env.logger.debug("[Definition] no definitions found")
env.logger.debug("[Definition] no definitions found")
end

definitions.each(&block)
Expand All @@ -61,9 +62,14 @@ def define(definition_name,template_name,options = {})

env.logger.debug("Forceflag : #{options['force']}")

git_template=false
# Check if the template is a git repo
if template_name.start_with?("git://")
git_template=true
end
# Check if template exists
template=env.templates[template_name]
if template.nil?
if template.nil? and ! git_template
env.logger.fatal("Template '#{template_name}' does not exist")
raise Veewee::TemplateError, "Template '#{template_name}' does not exist"
else
Expand All @@ -89,13 +95,25 @@ def define(definition_name,template_name,options = {})
env.logger.debug("Definition Directory '#{File.join(env.definition_dir,definition_name)}' succesfuly created")

# Start copying/cloning the directory of the template to the definition directory
begin
env.logger.debug("Starting copy '#{template.path}' to '#{dst_dir}'")
FileUtils.cp_r(template.path+"/.",dst_dir)
env.logger.debug("Copy '#{template.path}' to '#{dst_dir}' succesfull")
rescue Exception => ex
env.logger.fatal("Copy '#{template.path}' to #{dst_dir}' failed: #{ex}")
raise Veewee::Error , "Copy '#{template.path}' to #{dst_dir}' failed: #{ex}"
if (git_template)
begin
env.logger.debug("Starting git clone #{template_name} #{dst_dir}")
g = Grit::Git.new(dst_dir)
g.clone({ :timeout => false }, template_name, dst_dir)
rescue Exception => ex
err = "git clone #{template_name} #{dst_dir} failed: #{ex}"
env.logger.fatal(err)
raise Veewee::Error, err
end
else
begin
env.logger.debug("Starting copy '#{template.path}' to '#{dst_dir}'")
FileUtils.cp_r(template.path+"/.",dst_dir)
env.logger.debug("Copy '#{template.path}' to '#{dst_dir}' succesfull")
rescue Exception => ex
env.logger.fatal("Copy '#{template.path}' to #{dst_dir}' failed: #{ex}")
raise Veewee::Error , "Copy '#{template.path}' to #{dst_dir}' failed: #{ex}"
end
end

definition=env.definitions[definition_name]
Expand Down
1 change: 1 addition & 0 deletions veewee.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ Gem::Specification.new do |s|
s.add_dependency "ruby-vnc", "~> 1.0.0"
s.add_dependency "fog", "~> 1.1.2"
s.add_dependency "childprocess"
s.add_dependency "grit"

# Modified dependency version, as libxml-ruby dependency has been removed in version 2.1.1
# See : https://github.com/ckruse/CFPropertyList/issues/14
Expand Down