dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Set Style/AlignHash EnforcedHashRocketStyle to 'table'

This commit is contained in:
Parker Moore 2016-05-16 16:24:01 -07:00
parent eb56ca8c41
commit 2caff755c4
No known key found for this signature in database
GPG Key ID: 193CDEBA72063C58
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.rubocop.yml
View File

@ -145,7 +145,7 @@ Style/Alias:
Style/AlignArray: Style/AlignArray:
Enabled: false Enabled: false
Style/AlignHash: Style/AlignHash:
SupportedLastArgumentHashStyles: always_ignore EnforcedHashRocketStyle: table
Style/AlignParameters: Style/AlignParameters:
EnforcedStyle: with_fixed_indentation EnforcedStyle: with_fixed_indentation
Enabled: false Enabled: false

20
lib/jekyll/commands/serve.rb
View File

@ -3,14 +3,14 @@ module Jekyll
class Serve < Command class Serve < Command
class << self class << self
COMMAND_OPTIONS = { COMMAND_OPTIONS = {
"ssl_cert" => ["--ssl-cert [CERT]", "X.509 (SSL) certificate."], "ssl_cert" => ["--ssl-cert [CERT]", "X.509 (SSL) certificate."],
"host" => ["host", "-H", "--host [HOST]", "Host to bind to"], "host" => ["host", "-H", "--host [HOST]", "Host to bind to"],
"open_url" => ["-o", "--open-url", "Launch your browser with your site."], "open_url" => ["-o", "--open-url", "Launch your site in a browser"],
"detach" => ["-B", "--detach", "Run the server in the background (detach)"], "detach" => ["-B", "--detach", "Run the server in the background"],
"ssl_key" => ["--ssl-key [KEY]", "X.509 (SSL) Private Key."], "ssl_key" => ["--ssl-key [KEY]", "X.509 (SSL) Private Key."],
"port" => ["-P", "--port [PORT]", "Port to listen on"], "port" => ["-P", "--port [PORT]", "Port to listen on"],
"baseurl" => ["-b", "--baseurl [URL]", "Base URL"], "baseurl" => ["-b", "--baseurl [URL]", "Base URL"],
"show_dir_listing" => ["--show-dir-listing", "show_dir_listing" => ["--show-dir-listing",
"Show a directory listing instead of loading your index file."], "Show a directory listing instead of loading your index file."],
"skip_initial_build" => ["skip_initial_build", "--skip-initial-build", "skip_initial_build" => ["skip_initial_build", "--skip-initial-build",
"Skips the initial site build which occurs before the server is started."] "Skips the initial site build which occurs before the server is started."]
@ -117,10 +117,10 @@ module Jekyll
private private
def server_address(server, opts) def server_address(server, opts)
format("%{prefix}://%{address}:%{port}%{baseurl}", { format("%{prefix}://%{address}:%{port}%{baseurl}", {
:prefix => server.config[:SSLEnable] ? "https" : "http", :prefix => server.config[:SSLEnable] ? "https" : "http",
:baseurl => opts["baseurl"] ? "#{opts["baseurl"]}/" : "", :baseurl => opts["baseurl"] ? "#{opts["baseurl"]}/" : "",
:address => server.config[:BindAddress], :address => server.config[:BindAddress],
:port => server.config[:Port] :port => server.config[:Port]
}) })
end end