From c01dc2df7cefb38213633de6b826adad6cf36bb0 Mon Sep 17 00:00:00 2001 From: Dan Barber Date: Thu, 25 Jan 2018 17:56:43 -0500 Subject: [PATCH] Move the Netlify env stuff into a library --- Rakefile | 24 ++++++------------------ _lib/netlify.rb | 15 +++++++++++++++ 2 files changed, 21 insertions(+), 18 deletions(-) create mode 100644 _lib/netlify.rb diff --git a/Rakefile b/Rakefile index f4c8268..f7918a4 100644 --- a/Rakefile +++ b/Rakefile @@ -1,27 +1,15 @@ # Including only the changed build task -require 'jekyll' +require "jekyll" +require "./_lib/netlify" task default: %w[build] desc "Build the site" task :build do - config = Jekyll.configuration(config_params) + config = Jekyll.configuration({ + url: Netlify.site_url + }) site = Jekyll::Site.new(config) + Jekyll::Commands::Build.build(site, config) end - -def config_params - { url: site_url } -end - -def site_url - if production? - ENV["URL"] - else - ENV["DEPLOY_URL"] - end -end - -def production? - ENV["CONTEXT"] == "production" -end diff --git a/_lib/netlify.rb b/_lib/netlify.rb new file mode 100644 index 0000000..a56021b --- /dev/null +++ b/_lib/netlify.rb @@ -0,0 +1,15 @@ +module Netlify + def self.site_url + if production? + ENV["URL"] + else + ENV["DEPLOY_URL"] + end + end + + private + + def self.production? + ENV["CONTEXT"] == "production" + end +end