Merge pull request #415 from jekyll/race

Bring watch back
jekyll · Sep 24, 2017 · c16185f · c16185f
2 parents 1485512 + b54a9a4
commit c16185f
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 22 deletions.
diff --git a/lib/jekyll-admin.rb b/lib/jekyll-admin.rb
@@ -39,7 +39,6 @@ def self.site
 
 # Monkey Patches
 require_relative "./jekyll/commands/serve"
-require_relative "./jekyll/commands/build"
 
 [Jekyll::Page, Jekyll::Document, Jekyll::StaticFile, Jekyll::Collection].each do |klass|
   klass.include JekyllAdmin::APIable

diff --git a/lib/jekyll-admin/file_helper.rb b/lib/jekyll-admin/file_helper.rb
@@ -21,7 +21,12 @@ def write_file(path, content)
       File.open(path, "wb") do |file|
         file.write(content)
       end
-      site.process
+      # we should fully process in dev mode for tests to pass
+      if ENV["RACK_ENV"] == "production"
+        site.read
+      else
+        site.process
+      end
     end
 
     # Delete the file at the given path
@@ -31,6 +36,11 @@ def delete_file(path)
       site.process
     end
 
+    def delete_file_without_process(path)
+      Jekyll.logger.debug "DELETING:", path
+      FileUtils.rm_f sanitized_path(path)
+    end
+
     private
 
     def ensure_requested_file

diff --git a/lib/jekyll-admin/server/collection.rb b/lib/jekyll-admin/server/collection.rb
@@ -25,7 +25,7 @@ class Server < Sinatra::Base
 
         if renamed?
           ensure_requested_file
-          delete_file path
+          delete_file_without_process path
         end
 
         write_file write_path, document_body

diff --git a/lib/jekyll-admin/server/data.rb b/lib/jekyll-admin/server/data.rb
@@ -17,7 +17,7 @@ class Server < Sinatra::Base
       put "/*?/?:path.:ext" do
         if renamed?
           ensure_requested_file
-          delete_file path
+          delete_file_without_process path
         end
 
         write_file write_path, data_file_body

diff --git a/lib/jekyll-admin/server/page.rb b/lib/jekyll-admin/server/page.rb
@@ -16,7 +16,7 @@ class Server < Sinatra::Base
 
         if renamed?
           ensure_requested_file
-          delete_file path
+          delete_file_without_process path
         end
 
         write_file write_path, page_body

diff --git a/lib/jekyll-admin/server/static_file.rb b/lib/jekyll-admin/server/static_file.rb
@@ -18,7 +18,7 @@ class Server < Sinatra::Base
       put "/*" do
         if renamed?
           ensure_requested_file
-          delete_file path
+          delete_file_without_process path
         end
 
         write_file(write_path, static_file_body)

diff --git a/lib/jekyll/commands/build.rb b/lib/jekyll/commands/build.rb
diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb
@@ -16,8 +16,6 @@ def start_up_webrick(opts, destination)
         def jekyll_admin_monkey_patch(server)
           server.mount "/admin", Rack::Handler::WEBrick, JekyllAdmin::StaticServer
           server.mount "/_api",  Rack::Handler::WEBrick, JekyllAdmin::Server
-          Jekyll.logger.warn "Auto-regeneration:", "disabled by JekyllAdmin."
-          Jekyll.logger.warn "", "The site will regenerate only via the Admin interface."
           Jekyll.logger.info "JekyllAdmin mode:", ENV["RACK_ENV"] || "production"
         end
       end