geb 0.1.11 → 0.1.12

data/test/api tests/test_server.rb

@@ -17,8 +17,8 @@ class TestServer < Geb::ApiTest
 
     site_mock = mock('site')
     site_mock.stubs(:site_path).returns('site_path')
-    site_mock.stubs(:get_site_output_directory).returns('site_path/output')
-    site_mock.stubs(:get_site_release_directory).returns('site_path/release')
+    site_mock.stubs(:get_site_local_output_directory).returns('site_path/output')
+    site_mock.stubs(:get_site_release_output_directory).returns('site_path/release')
 
     http_server_mock = mock('webric_httpserver')
     http_server_mock.stubs(:config).returns({:Port => 3456, :DocumentRoot => 'site_path/output'})
@@ -29,7 +29,7 @@ class TestServer < Geb::ApiTest
     WEBrick::HTTPServer.expects(:new).returns(http_server_mock)
     Listen.stubs(:to).returns(file_watcher_mock)
 
-    server = Geb::Server.new(site_mock, 3456, true)
+    server = Geb::Server.new(site_mock, 3456, true, false)
 
     assert_instance_of Geb::Server, server
 
@@ -42,8 +42,8 @@ class TestServer < Geb::ApiTest
 
     site_mock = mock('site')
     site_mock.stubs(:site_path).returns('site_path')
-    site_mock.stubs(:get_site_output_directory).returns('site_path/output')
-    site_mock.stubs(:get_site_release_directory).returns('site_path/release')
+    site_mock.stubs(:get_site_local_output_directory).returns('site_path/output')
+    site_mock.stubs(:get_site_release_output_directory).returns('site_path/release')
 
     http_server_mock = mock('webric_httpserver')
     http_server_mock.stubs(:config).returns({:Port => 3456, :DocumentRoot => 'site_path/output'})
@@ -54,7 +54,7 @@ class TestServer < Geb::ApiTest
     WEBrick::HTTPServer.expects(:new).returns(http_server_mock)
     Listen.stubs(:to).returns(file_watcher_mock)
 
-    server = Geb::Server.new(site_mock, 3456, false)
+    server = Geb::Server.new(site_mock, 3456, false, false)
 
     assert_instance_of Geb::Server, server
 
@@ -67,8 +67,8 @@ class TestServer < Geb::ApiTest
 
     site_mock = mock('site')
     site_mock.stubs(:site_path).returns('site_path')
-    site_mock.stubs(:get_site_output_directory).returns('site_path/output')
-    site_mock.stubs(:get_site_release_directory).returns('site_path/release')
+    site_mock.stubs(:get_site_local_output_directory).returns('site_path/output')
+    site_mock.stubs(:get_site_release_output_directory).returns('site_path/release')
 
     http_server_mock = mock('webric_httpserver')
     http_server_mock.expects(:start)
@@ -81,7 +81,7 @@ class TestServer < Geb::ApiTest
     WEBrick::HTTPServer.stubs(:new).returns(http_server_mock)
     Listen.stubs(:to).returns(file_watcher_mock)
 
-    server = Geb::Server.new(site_mock, 3456, true)
+    server = Geb::Server.new(site_mock, 3456, true, false)
 
     server.start
 
@@ -104,8 +104,8 @@ class TestServer < Geb::ApiTest
 
     site_mock = mock('site')
     site_mock.stubs(:site_path).returns('site_path')
-    site_mock.stubs(:get_site_output_directory).returns('site_path/output')
-    site_mock.stubs(:get_site_release_directory).returns('site_path/release')
+    site_mock.stubs(:get_site_local_output_directory).returns('site_path/output')
+    site_mock.stubs(:get_site_release_output_directory).returns('site_path/release')
 
     http_server_mock = mock('webric_httpserver')
     http_server_mock.expects(:start)
@@ -118,7 +118,7 @@ class TestServer < Geb::ApiTest
     WEBrick::HTTPServer.stubs(:new).returns(http_server_mock)
     Listen.stubs(:to).returns(file_watcher_mock)
 
-    server = Geb::Server.new(site_mock, 3456, false)
+    server = Geb::Server.new(site_mock, 3456, false, false)
 
     server.start
 
@@ -140,8 +140,8 @@ class TestServer < Geb::ApiTest
 
     site_mock = mock('site')
     site_mock.stubs(:site_path).returns('site_path')
-    site_mock.stubs(:get_site_output_directory).returns('site_path/output')
-    site_mock.stubs(:get_site_release_directory).returns('site_path/release')
+    site_mock.stubs(:get_site_local_output_directory).returns('site_path/output')
+    site_mock.stubs(:get_site_release_output_directory).returns('site_path/release')
 
     http_server_mock = mock('webric_httpserver')
     http_server_mock.stubs(:config).returns({:Port => 3456, :DocumentRoot => 'site_path/output'})
@@ -157,7 +157,7 @@ class TestServer < Geb::ApiTest
     WEBrick::HTTPServer.stubs(:new).returns(http_server_mock)
     Listen.stubs(:to).returns(file_watcher_mock)
 
-    server = Geb::Server.new(site_mock, 3456, true)
+    server = Geb::Server.new(site_mock, 3456, true, false)
 
     server.start
 
@@ -174,8 +174,8 @@ class TestServer < Geb::ApiTest
 
     site_mock = mock('site')
     site_mock.stubs(:site_path).returns('site_path')
-    site_mock.stubs(:get_site_output_directory).returns('site_path/output')
-    site_mock.stubs(:get_site_release_directory).returns('site_path/release')
+    site_mock.stubs(:get_site_local_output_directory).returns('site_path/output')
+    site_mock.stubs(:get_site_release_output_directory).returns('site_path/release')
 
     http_server_mock = mock('webric_httpserver')
     http_server_mock.stubs(:config).returns({:Port => 3456, :DocumentRoot => 'site_path/output'})
@@ -189,7 +189,7 @@ class TestServer < Geb::ApiTest
     WEBrick::HTTPServer.stubs(:new).returns(http_server_mock)
     Listen.stubs(:to).returns(file_watcher_mock)
 
-    server = Geb::Server.new(site_mock, 3456, false)
+    server = Geb::Server.new(site_mock, 3456, false, false)
 
     server.start
 
@@ -212,8 +212,8 @@ class TestServer < Geb::ApiTest
 
       site_mock = mock('site')
       site_mock.stubs(:site_path).returns(dir)
-      site_mock.stubs(:get_site_output_directory).returns(dir)
-      site_mock.stubs(:get_site_release_directory).returns(dir)
+      site_mock.stubs(:get_site_local_output_directory).returns(dir)
+      site_mock.stubs(:get_site_release_output_directory).returns(dir)
       http_server_mock = mock('webric_httpserver')
       http_server_mock.stubs(:config).returns({:Port => 3456, :DocumentRoot => 'site_path/output'})
       file_watcher_mock = mock('file_watcher')
@@ -222,7 +222,7 @@ class TestServer < Geb::ApiTest
       WEBrick::HTTPServer.stubs(:new).returns(http_server_mock)
       Listen.stubs(:to).returns(file_watcher_mock)
 
-      geb_server = Geb::Server.new(site_mock, port, true)
+      geb_server = Geb::Server.new(site_mock, port, true, false)
 
       WEBrick::HTTPServer.unstub(:new)
 
@@ -253,8 +253,8 @@ class TestServer < Geb::ApiTest
 
       site_mock = mock('site')
       site_mock.stubs(:site_path).returns(dir)
-      site_mock.stubs(:get_site_output_directory).returns(dir)
-      site_mock.stubs(:get_site_release_directory).returns(dir)
+      site_mock.stubs(:get_site_local_output_directory).returns(dir)
+      site_mock.stubs(:get_site_release_output_directory).returns(dir)
       http_server_mock = mock('webric_httpserver')
       http_server_mock.stubs(:config).returns({:Port => 3456, :DocumentRoot => 'site_path/output'})
       file_watcher_mock = mock('file_watcher')
@@ -263,7 +263,7 @@ class TestServer < Geb::ApiTest
       WEBrick::HTTPServer.stubs(:new).returns(http_server_mock)
       Listen.stubs(:to).returns(file_watcher_mock)
 
-      geb_server = Geb::Server.new(site_mock, 8888, true)
+      geb_server = Geb::Server.new(site_mock, 8888, true, false)
 
       Listen.unstub(:to)
       file_watcher  = geb_server.send(:get_file_watcher)
@@ -302,8 +302,8 @@ class TestServer < Geb::ApiTest
 
       site_mock = mock('site')
       site_mock.stubs(:site_path).returns(site_dir)
-      site_mock.stubs(:get_site_output_directory).returns(site_output_directory)
-      site_mock.stubs(:get_site_release_directory).returns(site_release_directory)
+      site_mock.stubs(:get_site_local_output_directory).returns(site_output_directory)
+      site_mock.stubs(:get_site_release_output_directory).returns(site_release_directory)
       site_mock.expects(:build).times(1)
 
       http_server_mock = mock('webric_httpserver')
@@ -314,15 +314,13 @@ class TestServer < Geb::ApiTest
       WEBrick::HTTPServer.stubs(:new).returns(http_server_mock)
       Listen.stubs(:to).returns(file_watcher_mock)
 
-      geb_server = Geb::Server.new(site_mock, 8888, true)
+      geb_server = Geb::Server.new(site_mock, 8888, true, false)
 
       Listen.unstub(:to)
 
       log_output = ""
       Geb.stubs(:log_start) { |*args| log_output << args.first }
       Geb.stubs(:log)       { |*args| log_output << args.first }
-
-      # initialize a sequence
       Geb.expects(:log_start).times(1).with("Found changes, rebuilding site ... ")
       Geb.expects(:log).times(4)
 
@@ -346,6 +344,72 @@ class TestServer < Geb::ApiTest
   end # test "that the server detects file changes and rebuilds the site"
 
 
+  test "that the server detects file changes and rebuilds the site with debug set" do
+
+    # create a temporary directory
+    Dir.mktmpdir do |dir|
+
+      site_dir = File.join(dir, 'newsite')
+      site_output_directory = File.join(site_dir, 'output/local')
+      site_release_directory = File.join(site_dir, 'output/release')
+
+      file_path_add = File.join(site_dir, 'add.html')
+      file_path_modify = File.join(site_dir, 'modify.html')
+      file_path_delete = File.join(site_dir, 'delete.html')
+
+      FileUtils.mkdir_p(site_dir)
+      FileUtils.mkdir_p(site_output_directory)
+      FileUtils.mkdir_p(site_release_directory)
+
+      FileUtils.touch(file_path_modify)
+      File.write(file_path_modify, 'modify file original content')
+      FileUtils.touch(file_path_delete)
+      File.write(file_path_delete, 'delete file content')
+
+      site_mock = mock('site')
+      site_mock.stubs(:site_path).returns(site_dir)
+      site_mock.stubs(:get_site_local_output_directory).returns(site_output_directory)
+      site_mock.stubs(:get_site_release_output_directory).returns(site_release_directory)
+      site_mock.expects(:build).times(1)
+
+      http_server_mock = mock('webric_httpserver')
+      http_server_mock.stubs(:config).returns({:Port => 3456, :DocumentRoot => 'site_path/output'})
+      file_watcher_mock = mock('file_watcher')
+      file_watcher_mock.stubs(:ignore)
+
+      WEBrick::HTTPServer.stubs(:new).returns(http_server_mock)
+      Listen.stubs(:to).returns(file_watcher_mock)
+
+      geb_server = Geb::Server.new(site_mock, 8888, true, true)
+
+      Listen.unstub(:to)
+
+      log_output = ""
+      Geb.stubs(:log_start) { |*args| log_output << args.first }
+      Geb.stubs(:log)       { |*args| log_output << args.first }
+      Geb.expects(:log_start).times(1).with("Found changes, rebuilding site ... ")
+      Geb.expects(:log).times(4)
+
+      file_watcher = geb_server.send(:get_file_watcher)
+
+      file_watcher.start
+
+      sleep 0.5
+
+      FileUtils.touch(file_path_add)
+      File.write(file_path_add, 'add file content')
+      File.write(file_path_modify, 'modify file modified content')
+      FileUtils.rm(file_path_delete)
+
+      sleep 0.5
+
+      file_watcher.stop
+
+    end # Dir.mktmpdir
+
+  end # test "that the server detects file changes and rebuilds the site with debug set"
+
+
   test "that the server detects file changes handles exception is build fails" do
 
     # create a temporary directory
@@ -370,8 +434,8 @@ class TestServer < Geb::ApiTest
 
       site_mock = mock('site')
       site_mock.stubs(:site_path).returns(site_dir)
-      site_mock.stubs(:get_site_output_directory).returns(site_output_directory)
-      site_mock.stubs(:get_site_release_directory).returns(site_release_directory)
+      site_mock.stubs(:get_site_local_output_directory).returns(site_output_directory)
+      site_mock.stubs(:get_site_release_output_directory).returns(site_release_directory)
       site_mock.expects(:build).raises(Geb::Error, "Build failed")
 
       http_server_mock = mock('webric_httpserver')
@@ -382,7 +446,7 @@ class TestServer < Geb::ApiTest
       WEBrick::HTTPServer.stubs(:new).returns(http_server_mock)
       Listen.stubs(:to).returns(file_watcher_mock)
 
-      geb_server = Geb::Server.new(site_mock, 8888, true)
+      geb_server = Geb::Server.new(site_mock, 8888, true, false)
 
       Listen.unstub(:to)
 

data/test/api tests/test_site.rb

@@ -629,6 +629,55 @@ class SiteTest < Geb::ApiTest
 
   end # test "that the build pages method throws an exception if the page output throws an exception"
 
+  test "that the build pages methods builds pages with custom page extensions" do
+
+      site = Geb::Site.new
+      test_site_path = "test/site"
+
+      Dir.mktmpdir do |temp_dir|
+
+        site_path = File.join(temp_dir, test_site_path)
+
+        site_pages = []
+        site_pages << File.join(site_path, "index.html")
+        site_pages << File.join(site_path, "about.htm")
+        site_pages << File.join(site_path, "contact.html")
+        site_pages << File.join(site_path, "sub/page.html")
+        site_pages << File.join(site_path, "sub/sub/page.htm")
+        site_pages << File.join(site_path, "assets/styles/foo.css")
+        site_pages.sort!
+
+        FileUtils.mkdir_p(site_path)
+
+        site_pages.each do |page|
+          FileUtils.mkdir_p(File.dirname(page))
+          FileUtils.touch(page)
+        end
+
+        config = mock('config')
+        config.stubs(:site_name).returns("site")
+        config.stubs(:output_dir).returns("output")
+        config.stubs(:page_extensions).returns([".htm", ".css"])
+        config.stubs(:template_and_partial_identifier).returns(Geb::Defaults::TEMPLATE_AND_PARTIAL_IDENTIFIER)
+
+        page_mock = mock('page')
+        page_mock.expects(:build).times(3)
+        Geb::Page.expects(:new).returns(page_mock).with(site, File.join(site_path, "about.htm")).once
+        Geb::Page.expects(:new).returns(page_mock).with(site, File.join(site_path, "sub/sub/page.htm")).once
+        Geb::Page.expects(:new).returns(page_mock).with(site, File.join(site_path, "assets/styles/foo.css")).once
+
+        site.instance_variable_set(:@loaded, true)
+        site.instance_variable_set(:@site_path, site_path)
+        site.instance_variable_set(:@site_config, config)
+        site.expects(:clear_site_output_directory).once
+        site.expects(:output_site).once
+
+        site.build_pages
+
+      end # Dir.mktmpdir
+
+  end # test "that the build pages methods builds pages with custom page extensions"
+
   test "that get page files method returns a list of page files using defaults" do
 
     site = Geb::Site.new
@@ -661,11 +710,10 @@ class SiteTest < Geb::ApiTest
 
   end # test "that get page files method returns a list of page files using defaults"
 
-  test "that get page files method returns a list of page files using custom page extension" do
+  test "that get page files method returns a list of page files using custom page extensions" do
 
     site = Geb::Site.new
     test_site_path = "test/site"
-    test_page_extension = [".htm"]
 
     Dir.mktmpdir do |temp_dir|
 
@@ -675,6 +723,7 @@ class SiteTest < Geb::ApiTest
       site_pages << File.join(site_path, "index.htm")
       site_pages << File.join(site_path, "about.html")
       site_pages << File.join(site_path, "contact.htm")
+      site_pages << File.join(site_path, "styles/test.css")
       site_pages << File.join(site_path, "sub/page.htm")
       site_pages << File.join(site_path, "sub/sub/page.html")
       site_pages.sort!
@@ -686,13 +735,39 @@ class SiteTest < Geb::ApiTest
         FileUtils.touch(page)
       end
 
-      pages = site.send(:get_page_files, site_path, test_page_extension)
+      pages = site.get_page_files(site_path, [".htm"])
+
+      assert_equal 3, pages.length
+      assert_includes pages, File.join(site_path, "index.htm")
+      refute_includes pages, File.join(site_path, "about.html")
+      assert_includes pages, File.join(site_path, "contact.htm")
+      refute_includes pages, File.join(site_path, "styles/test.css")
+      assert_includes pages, File.join(site_path, "sub/page.htm")
+      refute_includes pages, File.join(site_path, "sub/sub/page.html")
+
+      pages = site.get_page_files(site_path, [".htm", ".css"])
+
+      assert_equal 4, pages.length
+      assert_includes pages, File.join(site_path, "index.htm")
+      refute_includes pages, File.join(site_path, "about.html")
+      assert_includes pages, File.join(site_path, "contact.htm")
+      assert_includes pages, File.join(site_path, "styles/test.css")
+      assert_includes pages, File.join(site_path, "sub/page.htm")
+      refute_includes pages, File.join(site_path, "sub/sub/page.html")
+
+      pages = site.get_page_files(site_path, [".htm", "css"])
 
-      assert_equal site_pages.length - 2, pages.length
+      assert_equal 4, pages.length
+      assert_includes pages, File.join(site_path, "index.htm")
+      refute_includes pages, File.join(site_path, "about.html")
+      assert_includes pages, File.join(site_path, "contact.htm")
+      assert_includes pages, File.join(site_path, "styles/test.css")
+      assert_includes pages, File.join(site_path, "sub/page.htm")
+      refute_includes pages, File.join(site_path, "sub/sub/page.html")
 
     end # Dir.mktmpdir
 
-  end # test "that get page files method returns a list of page files using custom page extension"
+  end # test "that get page files method returns a list of page files using custom page extensions"
 
   test "that the get page files method returns a list of page files while ignoring files with ignore pattern" do
 
@@ -788,7 +863,7 @@ class SiteTest < Geb::ApiTest
       site.instance_variable_set(:@site_path, site_path)
       site.instance_variable_set(:@site_config, config)
 
-      site.send(:clear_site_output_directory)
+      site.clear_site_output_directory(site.get_site_local_output_directory())
 
       # check to make sure all the files and directories are gone
       refute Dir.exist?(File.join(site_path, Geb::Defaults::OUTPUT_DIR, Geb::Defaults::LOCAL_OUTPUT_DIR, "sub"))
@@ -798,7 +873,7 @@ class SiteTest < Geb::ApiTest
 
   end # test "that the clear site output directory method clears the output directory"
 
-  test "that the output site method copies the local output directory to the release output directory" do
+  test "that the output site method files from one directory to another" do
 
     site = Geb::Site.new
     test_site_path = "test/site"
@@ -822,7 +897,7 @@ class SiteTest < Geb::ApiTest
       site.instance_variable_set(:@site_path, site_path)
       site.instance_variable_set(:@site_config, config)
 
-      site.send(:output_site, very_temp_dir)
+      site.output_site(very_temp_dir, site.get_site_local_output_directory())
 
       # check to make sure all the files and directories are gone
       assert Dir.exist?(File.join(site_path, Geb::Defaults::OUTPUT_DIR, Geb::Defaults::LOCAL_OUTPUT_DIR, "sub"))
@@ -830,24 +905,22 @@ class SiteTest < Geb::ApiTest
 
     end # Dir.mktmpdir
 
-  end # test "that the output site method copies the local output directory to the release output directory"
+  end # test "that the output site method files from one directory to another"
 
   test "that the release method executes the site build first" do
 
     site = Geb::Site.new
     test_site_path = "test/site"
-    test_site_release_dir = File.join(test_site_path, Geb::Defaults::OUTPUT_DIR, Geb::Defaults::RELEASE_OUTPUT_DIR)
 
-    execution_sequence = sequence('execution_sequence')
-    site.expects(:build).once.in_sequence(execution_sequence)
-    site.expects(:get_site_release_directory).returns(test_site_release_dir).once.in_sequence(execution_sequence)
-    site.expects(:clear_site_release_directory).once.in_sequence(execution_sequence)
-    site.expects(:copy_site_to_release_directory).once.in_sequence(execution_sequence)
+    site.expects(:build).once
 
     site.instance_variable_set(:@site_path, test_site_path)
+    site.instance_variable_set(:@loaded, true)
 
     site.release
 
+    # TODO: More...
+
   end # test "that the release method executes the site build first"
 
   test "that the site release directory is correctly generated" do
@@ -860,33 +933,59 @@ class SiteTest < Geb::ApiTest
     site.instance_variable_set(:@site_path, test_site_path)
     site.instance_variable_set(:@site_config, config)
 
-    site_release_directory = site.get_site_release_directory()
+    site_release_directory = site.get_site_release_output_directory()
 
     assert_equal File.join(test_site_path, Geb::Defaults::OUTPUT_DIR, Geb::Defaults::RELEASE_OUTPUT_DIR), site_release_directory
 
   end # test "that the site release directory is correctly generated"
 
-  test "that the site release calls correct file operations" do
+  test "that the site release sets and resets the releasing flag correctly" do
 
     site = Geb::Site.new
     test_site_path = "test/site"
-    test_site_output_dir = File.join(test_site_path, Geb::Defaults::OUTPUT_DIR, Geb::Defaults::LOCAL_OUTPUT_DIR)
-    test_site_release_dir = File.join(test_site_path, Geb::Defaults::OUTPUT_DIR, Geb::Defaults::RELEASE_OUTPUT_DIR)
 
-    execution_sequence = sequence('execution_sequence')
     site.expects(:build).once
-    site.stubs(:get_site_release_directory).returns(test_site_release_dir)
-    FileUtils.expects(:rm_rf).with(Dir.glob("#{test_site_release_dir}/*")).once.in_sequence(execution_sequence)
-    FileUtils.expects(:cp_r).with("#{test_site_output_dir}/.", test_site_release_dir).once.in_sequence(execution_sequence)
-
-    config = mock('config')
-    config.stubs(:output_dir).returns("output")
     site.instance_variable_set(:@site_path, test_site_path)
-    site.instance_variable_set(:@site_config, config)
+    site.instance_variable_set(:@loaded, true)
+    site.instance_variable_set(:@releasing, false)
 
     site.release
 
-  end # test "that the site release calls correct file operations"
+    refute site.releasing
+
+  end # test "that the site release sets and resets the releasing flag correctly"
+
+  test "that the site release handles site not being loaded" do
+
+    site = Geb::Site.new
+    test_site_path = "test/site"
+
+    site.instance_variable_set(:@site_path, test_site_path)
+    site.instance_variable_set(:@loaded, false)
+    site.instance_variable_set(:@releasing, false)
+
+    error = assert_raises Geb::Site::SiteNotLoadedError do
+      site.release
+    end
+
+    assert_includes error.message, "Could not release the site"
+
+  end # test "that the site release handles site not being loaded"
+
+  test "that the site release handles release flag already set" do
+
+    site = Geb::Site.new
+    test_site_path = "test/site"
+
+    site.instance_variable_set(:@site_path, test_site_path)
+    site.instance_variable_set(:@loaded, true)
+    site.instance_variable_set(:@releasing, true)
+
+    assert_raises Geb::Site::SiteReleasingError do
+      site.release
+    end
+
+  end # test "that the site release handles release flag already set"
 
   test "that site bundle template method executes as expected" do
 
@@ -899,6 +998,7 @@ class SiteTest < Geb::ApiTest
     config = mock('config')
     config.stubs(:template_paths).returns(template_paths_config)
     config.stubs(:output_dir).returns(Geb::Defaults::OUTPUT_DIR)
+    config.stubs(:generate_config_file)
     site.instance_variable_set(:@site_path, test_site_path)
     site.instance_variable_set(:@loaded, true)
     site.instance_variable_set(:@site_config, config)
@@ -1253,7 +1353,7 @@ class SiteTest < Geb::ApiTest
 
       FileUtils.touch(File.join(site_release_path, "dummy_file.html"))
 
-      assert_equal site_release_path, site.get_site_release_directory()
+      assert_equal site_release_path, site.get_site_release_output_directory()
 
       assert site.released?
 
@@ -1278,7 +1378,7 @@ class SiteTest < Geb::ApiTest
 
       FileUtils.mkdir_p(site_path)
 
-      assert_equal site_release_path, site.get_site_release_directory()
+      assert_equal site_release_path, site.get_site_release_output_directory()
 
       refute site.released?
 
@@ -1304,7 +1404,7 @@ class SiteTest < Geb::ApiTest
       FileUtils.mkdir_p(site_path)
       FileUtils.mkdir_p(site_release_path)
 
-      assert_equal site_release_path, site.get_site_release_directory()
+      assert_equal site_release_path, site.get_site_release_output_directory()
 
       refute site.released?
 

data/test/command tests/test_geb_build.rb

@@ -183,7 +183,7 @@ class TestGebCommandBuild < Geb::CliTest
 
     assert_includes stdout, "Loading site from path #{Dir.pwd} ... done."
     assert_includes stdout, "Found geb site at path #{Dir.pwd}"
-    assert_match(/Building \d* pages for/, stdout)
+    assert_match(/Building \d*.* pages locally/, stdout)
     assert_includes stdout, "loading page"
     assert_includes stdout, "loading template"
     assert_includes stdout, "loading partial"
@@ -191,7 +191,7 @@ class TestGebCommandBuild < Geb::CliTest
     assert_match(/Done building \d* pages for/, stdout)
     assert_includes stdout, "Clearing site output folder"
     assert_includes stdout, "Outputting site to"
-    assert_includes stdout, "Building assets for"
+    assert_match(/Building .* assets locally/, stdout)
     assert_includes stdout, "Done building assets for"
 
   end # test "that the command actually builds the site"

data/test/command tests/test_geb_release.rb

@@ -111,7 +111,7 @@ class TestGebCommandRelease < Geb::CliTest
 
     assert_includes stdout, "Loading site from path #{Dir.pwd} ... done."
     assert_includes stdout, "Found geb site at path #{Dir.pwd}"
-    assert_match(/Building \d* pages for/, stdout)
+    assert_match(/Building \d*.* pages for release/, stdout)
     assert_includes stdout, "loading page"
     assert_includes stdout, "loading template"
     assert_includes stdout, "loading partial"
@@ -119,10 +119,8 @@ class TestGebCommandRelease < Geb::CliTest
     assert_match(/Done building \d* pages for/, stdout)
     assert_includes stdout, "Clearing site output folder"
     assert_match(/Outputting site to.*done/, stdout)
-    assert_includes stdout, "Building assets for"
+    assert_match(/Building .* assets for release/, stdout)
     assert_includes stdout, "Done building assets for"
-    assert_match(/Clearing site release folder.*done/, stdout)
-    assert_match(/Releasing site to.*done/, stdout)
     refute_match(/Resolving directories and files to include in the template archive.*done/, stdout)
     refute_match(/Creating template archive in.*done/, stdout)
 
@@ -141,7 +139,7 @@ class TestGebCommandRelease < Geb::CliTest
 
     assert_includes stdout, "Loading site from path #{Dir.pwd} ... done."
     assert_includes stdout, "Found geb site at path #{Dir.pwd}"
-    assert_match(/Building \d* pages for/, stdout)
+    assert_match(/Building \d*.* pages for release/, stdout)
     assert_includes stdout, "loading page"
     assert_includes stdout, "loading template"
     assert_includes stdout, "loading partial"
@@ -149,13 +147,13 @@ class TestGebCommandRelease < Geb::CliTest
     assert_match(/Done building \d* pages for/, stdout)
     assert_includes stdout, "Clearing site output folder"
     assert_match(/Outputting site to.*done/, stdout)
-    assert_includes stdout, "Building assets for"
+    assert_match(/Building .* assets for release/, stdout)
     assert_includes stdout, "Done building assets for"
-    assert_match(/Clearing site release folder.*done/, stdout)
-    assert_match(/Releasing site to.*done/, stdout)
+    assert_match(/Clearing site output folder.*done/, stdout)
     assert_match(/Resolving directories and files to include in the template archive.*done/, stdout)
     assert_match(/copying directory and all sub-directories from.*to.*done/, stdout)
     assert_match(/copying file from.*to.*done/, stdout)
+    assert_match(/Generating geb\.config\.yml in the template archive directory.*done/, stdout)
     assert_includes stdout, "Done copying directories and files to the template archive directory."
     assert_match(/Creating template archive in.*done/, stdout)
 

data/test/command tests/test_geb_server.rb

@@ -100,6 +100,27 @@ class TestGebCommandServer < Geb::CliTest
 
   end # test "that command default executes"
 
+  test "that command default executes with debug option set to true" do
+
+    copy_test_site()
+    server_port  = Geb::Test::WebServerProxy.find_available_port()
+    geb_command = "geb server --port #{server_port} --debug"
+
+    server_up = lambda do |output, error_output|
+      output.include?("Server running on http://localhost:#{server_port}")
+    end
+
+    run_command_with_timeout(geb_command, break_condition: server_up) do |output, error_output|
+
+      assert_includes output, "Loading site from path #{Dir.pwd}"
+      assert_includes output, "Server running on http://localhost:#{server_port}"
+      assert_includes output, "Watching for changes in [#{Dir.pwd}]"
+      assert_match(/Building .* pages locally/, output)
+
+    end # run_command_with_timeout
+
+  end # test "that command default executes"
+
   test "that command handles being executed in a non-site directory" do
 
     # create a temporary directory