make publish.rb easier for those without ssh

dlech · dlech · commit d450b27c1771 · 2016-04-11T17:44:00.000-05:00
diff --git a/README.md b/README.md
@@ -50,8 +50,7 @@ Previewing Your Changes Online
 
 We have a special script to use to publish your changes using the `gh-pages`
 branch of your fork of ev3dev.github.io. If you have SSH setup for your GitHub
-account, simply run`./publish <gh-user>` where *gh-user* is your actual GitHub
-user name. If you don't have SSH setup, you can use https by running
-`./publish https://github.com/<gh-user>/ev3dev.github.io.git` instead.
+account, simply run`./publish <gh-user>` where `<gh-user>` is your actual GitHub
+user name.
 This will copy the contents of `_site`, fix it up a bit and push it to your
 fork on GitHub. You can view the results at `http://<gh-user>.github.io/ev3dev.github.io`.
diff --git a/publish.rb b/publish.rb
@@ -5,14 +5,11 @@
 # This script publishes the ev3dev website to the gh-pages branch of your
 # personal fork. This allows you to share a preview of your changes with others.
 #
-# Usage: ./publish.rb { <gh-user> | <gh-url> } [ --test '<command>' ] [ --no-fix-links ] 
+# Usage: ./publish.rb { <gh-user> } [ --ssh ] [ --test '<command>' ] [ --no-fix-links ]
 #
-# <gh-user> is your github user name. This is short for
-# "git@github.com:<gh-user>/ev3dev.github.io.git"
+# <gh-user> is your github user name.
 #
-# <gh-url> is the url for your fork on GitHub. For example, if you don't want
-# to use ssh, then pass "https://github.com/<gh-user>/ev3dev.github.io.git"
-# as the argument.
+# --ssh will use SSH instead of HTTPS when connecting to GitHub.
 #
 # --test '<command>' will run <command> in a shell and return the result. The
 # working directory will be a temporary directory containing the fixed up files.
@@ -36,9 +33,11 @@
     system "git init"
 
     unless ARGV.include? "--test"
-        git_url = ARGV[0]
-        if not git_url.include? "/"
-            git_url = "git@github.com:#{ARGV[0]}/ev3dev.github.io.git"
+        gh_user = ARGV[0]
+        if ARGV.include?("--ssh")
+            git_url = "git@github.com:#{gh_user}/ev3dev.github.io.git"
+        else
+            git_url = "https://github.com/#{gh_user}/ev3dev.github.io.git"
         end
         system "git remote add origin #{git_url}"
 
