Added Exceptions and Passing ABC Metric
This commit is contained in:
parent
451881efcf
commit
465e7dd8b0
|
@ -28,19 +28,7 @@ module Jekyll
|
||||||
"#{new_blog_path} exists and is not empty."
|
"#{new_blog_path} exists and is not empty."
|
||||||
end
|
end
|
||||||
|
|
||||||
if options["blank"]
|
if_options_blank(new_blog_path, options)
|
||||||
create_blank_site new_blog_path
|
|
||||||
else
|
|
||||||
create_sample_files new_blog_path
|
|
||||||
|
|
||||||
File.open(File.expand_path(initialized_post_name, new_blog_path), "w") do |f|
|
|
||||||
f.write(scaffold_post_content)
|
|
||||||
end
|
|
||||||
|
|
||||||
File.open(File.expand_path("Gemfile", new_blog_path), "w") do |f|
|
|
||||||
f.write(gemfile_contents)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
Jekyll.logger.info "New jekyll site installed in #{new_blog_path}."
|
Jekyll.logger.info "New jekyll site installed in #{new_blog_path}."
|
||||||
end
|
end
|
||||||
|
@ -91,6 +79,22 @@ gem "jekyll", "#{Jekyll::VERSION}"
|
||||||
RUBY
|
RUBY
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def if_options_blank(new_blog_path, options)
|
||||||
|
if options["blank"]
|
||||||
|
create_blank_site new_blog_path
|
||||||
|
else
|
||||||
|
create_sample_files new_blog_path
|
||||||
|
|
||||||
|
File.open(File.expand_path(initialized_post_name, new_blog_path), "w") do |f|
|
||||||
|
f.write(scaffold_post_content)
|
||||||
|
end
|
||||||
|
|
||||||
|
File.open(File.expand_path("Gemfile", new_blog_path), "w") do |f|
|
||||||
|
f.write(gemfile_contents)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
def preserve_source_location?(path, options)
|
def preserve_source_location?(path, options)
|
||||||
!options["force"] && !Dir["#{path}/**/*"].empty?
|
!options["force"] && !Dir["#{path}/**/*"].empty?
|
||||||
end
|
end
|
||||||
|
|
|
@ -171,10 +171,12 @@ module Jekyll
|
||||||
# forget to add one of the certificates.
|
# forget to add one of the certificates.
|
||||||
|
|
||||||
private
|
private
|
||||||
|
# rubocop:disable Metrics/AbcSize
|
||||||
def enable_ssl(opts)
|
def enable_ssl(opts)
|
||||||
return if !opts[:JekyllOptions]["ssl_cert"] && !opts[:JekyllOptions]["ssl_key"]
|
return if !opts[:JekyllOptions]["ssl_cert"] && !opts[:JekyllOptions]["ssl_key"]
|
||||||
if !opts[:JekyllOptions]["ssl_cert"] || !opts[:JekyllOptions]["ssl_key"]
|
if !opts[:JekyllOptions]["ssl_cert"] || !opts[:JekyllOptions]["ssl_key"]
|
||||||
raise RuntimeError
|
# rubocop:disable Style/RedundantException
|
||||||
|
raise RuntimeError, "--ssl-cert or --ssl-key missing."
|
||||||
end
|
end
|
||||||
require "openssl"
|
require "openssl"
|
||||||
require "webrick/https"
|
require "webrick/https"
|
||||||
|
|
|
@ -25,9 +25,8 @@ module Jekyll
|
||||||
super || super(req, res, "#{basename}.html")
|
super || super(req, res, "#{basename}.html")
|
||||||
end
|
end
|
||||||
|
|
||||||
#
|
# rubocop:disable Style/MethodName
|
||||||
|
def do_GET(req, res)
|
||||||
def do_get(req, res)
|
|
||||||
rtn = super
|
rtn = super
|
||||||
validate_and_ensure_charset(req, res)
|
validate_and_ensure_charset(req, res)
|
||||||
res.header.merge!(@headers)
|
res.header.merge!(@headers)
|
||||||
|
|
Loading…
Reference in New Issue