From f5bb4dd89ea64181910acb8ef0df5ae84644b75d Mon Sep 17 00:00:00 2001
From: erizhang <zhang.lyuan@gmail.com>
Date: Fri, 31 May 2013 11:19:47 +0800
Subject: add https protocol supporting during rake setup_github_pages
---
Rakefile | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
(limited to 'Rakefile')
diff --git a/Rakefile b/Rakefile
index a57a56f6..b9daf00c 100644
--- a/Rakefile
+++ b/Rakefile
@@ -305,9 +305,15 @@ task :setup_github_pages, :repo do |t, args|
else
puts "Enter the read/write url for your repository"
puts "(For example, 'git@github.com:your_username/your_username.github.io)"
+ puts " or 'https://github.com/your_username/your_username.github.io')"
repo_url = get_stdin("Repository url: ")
end
- user = repo_url.match(/:([^\/]+)/)[1]
+ protocol = (repo_url.match(/(^git)@/).nil?) ? 'https' : 'git'
+ if protocol == 'git'
+ user = repo_url.match(/:([^\/]+)/)[1]
+ else
+ user = repo_url.match(/github\.com\/([^\/]+)/)[1]
+ end
branch = (repo_url.match(/\/[\w-]+\.github\.(?:io|com)/).nil?) ? 'gh-pages' : 'master'
project = (branch == 'gh-pages') ? repo_url.match(/\/([^\.]+)/)[1] : ''
unless (`git remote -v` =~ /origin.+?octopress(?:\.git)?/).nil?
--
cgit v1.2.1