deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1448 from alex88/feature/git-url-template

Browse source 
Clone template from full repository urls
This commit is contained in:
Thomas Reynolds 2015-02-12 09:27:22 -08:00
parent 986b9fcf51 640c87c13a
commit 5cb880064d
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
middleman-cli/lib/middleman-cli/init.rb
View file

@ -53,6 +53,11 @@ module Middleman::Cli
run("git clone --depth 1 #{branch_cmd}#{repo_path} #{dir}") run("git clone --depth 1 #{branch_cmd}#{repo_path} #{dir}")
unless File.directory?(dir)
say 'Git clone failed, maybe the url is invalid or you don\'t have the permissions?', :red
exit
end
inside(target) do inside(target) do
thorfile = File.join(dir, 'Thorfile') thorfile = File.join(dir, 'Thorfile')
@ -68,18 +73,18 @@ module Middleman::Cli
run('bundle install') unless ENV['TEST'] || options[:'skip-bundle'] run('bundle install') unless ENV['TEST'] || options[:'skip-bundle']
end end
ensure ensure
FileUtils.remove_entry(dir) FileUtils.remove_entry(dir) if File.directory?(dir)
end end
end end
protected protected
def shortname?(repo) def shortname?(repo)
repo.split('/').length != 2 repo.split('/').length == 1
end end
def repository_path(repo) def repository_path(repo)
"git://github.com/#{repo}.git" repo.include?('://') ? repo : "git://github.com/#{repo}.git"
end end
# Add to CLI # Add to CLI