moparisthebest/android.moparisthebest.org
1
0
Fork 0
mirror of https://github.com/moparisthebest/android.moparisthebest.org synced 2024-11-16 06:05:00 -05:00
Code Issues Releases Wiki Activity

Improve previewing

Browse Source 
Previewing is typically done to verify a change to content, a plugin, or
a theme. In most of these cases, the person previewing will want to
re-generate before previewing. This commit adds a call to the `generate`
task from within the `preview` task to ensure that the newest content
will be previewed.

Additionally, since previewing is often done to verify changes to
themes, it can be helpful to be able to see un-minified assets. This
commit also sets a default value of 'development' to the `OCTOPRESS_ENV`
environment value, which is used when making decisions as to how assets
are compiled. This currently prevents the minification of the compiled
scss.

I also trimmed some trailing whitespace in the Rakefile.
This commit is contained in:
Joe Lencioni 2013-03-13 08:40:31 -07:00 committed by Brandon Mathis
parent fa105ce68d
commit d483912e4b
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Rakefile
View File

@ -147,6 +147,8 @@ end
desc "preview the site in a web browser." desc "preview the site in a web browser."
task :preview do task :preview do
raise "### You haven't set anything up yet. First run `rake install` to set up an Octopress theme." if configuration[:source].nil? || !File.directory?(configuration[:source]) raise "### You haven't set anything up yet. First run `rake install` to set up an Octopress theme." if configuration[:source].nil? || !File.directory?(configuration[:source])
ENV['OCTOPRESS_ENV'] ||= 'development'
Rake::Task["generate"].execute
guardPid = Process.spawn("guard") guardPid = Process.spawn("guard")
puts "Starting Rack, serving to http://#{configuration[:server_host]}:#{configuration[:server_port]}" puts "Starting Rack, serving to http://#{configuration[:server_host]}:#{configuration[:server_port]}"
rackupPid = Process.spawn("rackup --host #{configuration[:server_host]} --port #{configuration[:server_port]}") rackupPid = Process.spawn("rackup --host #{configuration[:server_host]} --port #{configuration[:server_port]}")
@ -273,7 +275,7 @@ task :update_stylesheets, :theme do |t, args|
rm_r "assets.old/stylesheets", :secure=>true rm_r "assets.old/stylesheets", :secure=>true
puts "Removed existing assets.old/stylesheets directory" puts "Removed existing assets.old/stylesheets directory"
end end
mkdir_p "assets.old" mkdir_p "assets.old"
if File.directory?("assets/stylesheets") if File.directory?("assets/stylesheets")
mv "assets/stylesheets", "assets.old/stylesheets" mv "assets/stylesheets", "assets.old/stylesheets"
puts "Moved stylesheets into assets.old/stylesheets" puts "Moved stylesheets into assets.old/stylesheets"
@ -298,7 +300,7 @@ task :update_javascripts, :theme do |t, args|
rm_r "assets.old/javascripts", :secure=>true rm_r "assets.old/javascripts", :secure=>true
puts "Removed existing assets.old/javascripts directory" puts "Removed existing assets.old/javascripts directory"
end end
mkdir_p "assets.old" mkdir_p "assets.old"
if File.directory?("assets/javascripts") if File.directory?("assets/javascripts")
cp_r "assets/javascripts/.", "assets.old/javascripts" cp_r "assets/javascripts/.", "assets.old/javascripts"
puts "Copied javascripts into assets.old/javascripts" puts "Copied javascripts into assets.old/javascripts"
@ -425,7 +427,7 @@ task :set_root_dir, :dir do |t, args|
site_configs = configurator.read_config('site.yml') site_configs = configurator.read_config('site.yml')
site_configs[:destination] = "public#{path}" site_configs[:destination] = "public#{path}"
root = "/#{path.sub(/^\//, '')}" root = "/#{path.sub(/^\//, '')}"
url = $1 if site_configs[:url] =~ /(https?:\/\/[^\/]+)/i url = $1 if site_configs[:url] =~ /(https?:\/\/[^\/]+)/i
site_configs[:url] = url + path site_configs[:url] = url + path
site_configs[:subscribe_rss] = "#{path}/atom.xml" site_configs[:subscribe_rss] = "#{path}/atom.xml"
site_configs[:root] = "#{root}" site_configs[:root] = "#{root}"
@ -565,7 +567,7 @@ def get_unpublished(posts, options={})
posts.sort.each do |post| posts.sort.each do |post|
file = File.read(post) file = File.read(post)
data = YAML.load file.match(/(^-{3}\n)(.+?)(\n-{3})/m)[2] data = YAML.load file.match(/(^-{3}\n)(.+?)(\n-{3})/m)[2]
if options[:env] == 'production' if options[:env] == 'production'
future = Time.now < Time.parse(data['date'].to_s) ? "future date: #{data['date']}" : false future = Time.now < Time.parse(data['date'].to_s) ? "future date: #{data['date']}" : false
end end