From cddf335f988ae4f2a5768c91ae92d4c1467511e8 Mon Sep 17 00:00:00 2001 From: James Luberda Date: Tue, 26 Jun 2018 00:34:36 -0400 Subject: [PATCH 1/3] added livereload call to server startup --- lib/jekyll/commands/serve.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb index 6b88a647f..4d5860d78 100644 --- a/lib/jekyll/commands/serve.rb +++ b/lib/jekyll/commands/serve.rb @@ -3,6 +3,10 @@ module Commands class Serve < Command class << self def start_up_webrick(opts, destination) + if opts["livereload"] + @reload_reactor.start(opts) + end + server = WEBrick::HTTPServer.new(webrick_opts(opts)).tap { |o| o.unmount("") } server.mount(opts["baseurl"], Servlet, destination, file_handler_opts) From 1fabd444fa370b031bc5e8a74e8deb41f63e483b Mon Sep 17 00:00:00 2001 From: James Luberda Date: Fri, 6 Jul 2018 13:12:24 -0400 Subject: [PATCH 2/3] upgraded rubocop to 0.57.2; added two cop configuration changes to .rubocop.yml --- .rubocop.yml | 8 ++++++++ jekyll-admin.gemspec | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.rubocop.yml b/.rubocop.yml index 11edf03b7..529037d84 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -17,3 +17,11 @@ Metrics/PerceivedComplexity: Style/FrozenStringLiteralComment: Enabled: false + +Naming/MemoizedInstanceVariableName: + Exclude: + - lib/jekyll-admin/page_without_a_file.rb + +Naming/UncommunicativeMethodParamName: + Exclude: + - lib/jekyll-admin/data_file.rb diff --git a/jekyll-admin.gemspec b/jekyll-admin.gemspec index 44089672d..cbd8b4cbe 100644 --- a/jekyll-admin.gemspec +++ b/jekyll-admin.gemspec @@ -35,7 +35,7 @@ Gem::Specification.new do |spec| spec.add_development_dependency "bundler", "~> 1.7" spec.add_development_dependency "rake", "~> 10.0" spec.add_development_dependency "rspec", "~> 3.4" - spec.add_development_dependency "rubocop", "~> 0.48.1" + spec.add_development_dependency "rubocop", "~> 0.57.2" spec.add_development_dependency "sinatra-cross_origin", "~> 0.3" spec.add_development_dependency "gem-release", "~> 0.7" end From 39a92d5dba80b5a271bef3ba335744b5b6233865 Mon Sep 17 00:00:00 2001 From: James Luberda Date: Sun, 8 Jul 2018 20:47:09 -0400 Subject: [PATCH 3/3] deleted test folder to resolve rspec example failure --- spec/fixtures/site/_posts/test/2016-01-02-test2.md | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 spec/fixtures/site/_posts/test/2016-01-02-test2.md diff --git a/spec/fixtures/site/_posts/test/2016-01-02-test2.md b/spec/fixtures/site/_posts/test/2016-01-02-test2.md deleted file mode 100644 index 7e98b0394..000000000 --- a/spec/fixtures/site/_posts/test/2016-01-02-test2.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -foo: bar2 ---- - -test \ No newline at end of file