Support custom config files from CLI

.rubocop.yml

@@ -11,3 +11,5 @@ AllCops:
 
 Metrics/BlockLength:
   Enabled: false
+Style/FrozenStringLiteralComment:
+  Enabled: false

jekyll-admin.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "jekyll", "~> 3.3"
+  spec.add_dependency "jekyll", "~> 3.6"
   spec.add_dependency "sinatra", "~> 1.4"
   spec.add_dependency "sinatra-contrib", "~> 1.4"
   spec.add_dependency "addressable", "~> 2.4"

lib/jekyll-admin/server/configuration.rb

@@ -39,9 +39,15 @@ def raw_configuration
         )
       end
 
-      # Returns the path to the *first* config file discovered
+      # Returns the path to the *first* config file from the list passed to terminal
+      # switch +--config+ or the first of default config files to be discovered at the
+      # site's source directory.
       def configuration_path
-        sanitized_path configuration.config_files(overrides).first
+        if site.config["config"]
+          sanitized_path site.config["config"].first
+        else
+          sanitized_path configuration.config_files(overrides).first
+        end
       end
 
       # The user's uploaded configuration for updates

spec/fixtures/site/_config_test.yml

@@ -0,0 +1,2 @@
+title: Custom Test Site
+gems: ["jekyll-admin"]

spec/jekyll-admin/custom_integration_spec.rb

@@ -0,0 +1,58 @@
+describe "custom integration" do
+  let(:source) { fixture_path("site") }
+  let(:dest) { File.join(source, "_site") }
+  let(:config) { File.join(source, "_config_test.yml") }
+
+  let(:args) do
+    [
+      "--detach",
+      "--watch",
+      "--source", source,
+      "--destination", dest,
+      "--config", config,
+    ]
+  end
+
+  let(:start_command) { %w(bundle exec jekyll serve).concat(args) }
+  let(:stop_command) { ["pkill", "-f", "jekyll"] }
+  let(:server) { "http://localhost:4000" }
+  let(:path) { "/" }
+  let(:uri) { URI.join(server, path) }
+  let(:response) { Net::HTTP.get_response(uri) }
+
+  before do
+    Open3.popen3(*start_command)
+    sleep 3
+  end
+
+  after { Open3.capture2e(*stop_command) }
+
+  context "Jekyll site" do
+    let(:path) { "/" }
+
+    it "serves the Jekyll site", :skip => Gem.win_platform? do
+      expect(response.code).to eql("200")
+      expect(response.body).to match("You're probably looking for")
+    end
+  end
+
+  context "Admin site" do
+    let(:path) { "/admin" }
+
+    it "serves the Jekyll site", :skip => Gem.win_platform? do
+      with_index_stubbed do
+        expect(response.code).to eql("200")
+        expect(response.body).to match("Jekyll Admin")
+      end
+    end
+  end
+
+  context "API" do
+    let(:path) { "/_api/configuration" }
+
+    it "serves the Jekyll site", :skip => Gem.win_platform? do
+      expect(response.code).to eql("200")
+      expect(response.body).to match("Custom Test Site")
+    end
+  end
+end