@@ -1,6 +1,7 @@ # Standard library require 'yaml' require 'time' +require 'pathname' # Gem libraries require 'rubygems' @@ -12,41 +13,43 @@ require 'rake/rdoctask' require 'lib/setup' VERSION_DATA = TarskiUtils::version_info("conf/version.yml") -PUBLICPATH = "../public" -PLUGINPATH = "#{PUBLIC_PATH}/wp/wp-content/plugins/tarskisite" TARSKI_VERSION = ENV['v'] || VERSION_DATA.first.first -TARSKI_DIR = "tarski" + +TARSKI_DIRNAME = "tarski" +UTIL_DIR = Pathname.new(__FILE__).dirname +LIB_DIR = UTIL_DIR + "lib" +SRC_DIR = UTIL_DIR + "src" +CONF_DIR = UTIL_DIR + "conf" +BUILD_DIR = UTIL_DIR + "build" +PUBLIC_DIR = UTIL_DIR + "../public" +PLUGIN_DIR = PUBLIC_DIR + "wp/wp-content/plugins/tarskisite" SVN_URL = "http://tarski.googlecode.com/svn" GIT_REPO = "git://github.com/ionfish/tarski.git" FEED_INFO = { - :url => "http://tarskitheme.com/" - :title => "Tarski update notification" + :url => "http://tarskitheme.com/", + :title => "Tarski update notification", :author => ["Benedict Eastaugh", "Chris Sternal-Johnson"]} desc "Creates a zip archive, and updates the version feed and changelog." -task :update => [:zip, :feed, :changelog, :plugin_version] +task :update => [:zip, :feed, :changelog] desc "Update the version feed to notify Tarski users of the new release." task :feed do - require 'lib/tarski_version' - puts "Generating version feed..." - TarskiVersion.new(VERSION_DATA, FEED_INFO).publish_feed("#{PUBLIC_PATH}/version.atom") - puts "Done." + require LIB_DIR + 'tarski_version' + + TarskiVersion.new(VERSION_DATA, FEED_INFO).publish_feed(PUBLIC_DIR + "version.atom") end desc "Generate the hooks documentation page." -task :hooks => :download do +task :hooks => [:co_working_copy, :pull_master] do require 'erb' - require 'lib/tarski_docs' + require LIB_DIR + 'tarski_docs' - puts "Generating hooks documentation..." - TarskiDocs.new(Dir.pwd + '/' + TARSKI_DIR).read.write("#{PUBLIC_PATH}/hooks.html") + TarskiDocs.new(SRC_DIR + TARSKI_DIRNAME).read.write(PUBLIC_DIR + "hooks.html") - puts "Cleaning up checked-out files..." `rm -rf tarski/` - puts "Done." end desc "Generate a new changelog HTML file." @@ -56,13 +59,11 @@ task :changelog do require 'hpricot' require 'open-uri' - puts "Reading changelog..." - - struct = File.open("conf/changelog-structure.html", "r") do |file| + struct = File.open(UTIL_DIR + "conf/changelog-structure.html", "r") do |file| Hpricot(file.read) end - doc = open("#{SVN_URL}/trunk/CHANGELOG") do |file| + doc = open(SRC_DIR + TARSKI_DIRNAME + "CHANGELOG") do |file| # The changelog is provided in Markdown format, so it needs to be # passed through BlueCloth before being read into Hpricot. Hpricot(Markdown.new(file.read).to_html) @@ -70,8 +71,6 @@ task :changelog do vlinks = Array.new - puts "Generating HTML..." - (doc/"h1").remove (doc/"h3").each do |header| @@ -84,16 +83,14 @@ task :changelog do struct.at("#version-links").inner_html = vlinks.join("\n") struct.search("#version-links").after(doc.to_html) - File.open("#{PUBLIC_PATH}/changelog.html", "w+") do |changelog| + File.open(PUBLIC_DIR + "changelog.html", "w+") do |changelog| changelog.puts(RubyPants.new(struct.to_html).to_html) end - - puts "Done." end desc "Add version data to the Tarski website plugin." task :plugin_version do - File.open("#{PLUGINPATH}/version.php", "w+") do |f| + File.open(PLUGIN_DIR + "version.php", "w+") do |f| f.print "<?php define('TARSKI_RELEASE_VERSION', #{TARSKI_VERSION}); @@ -104,35 +101,31 @@ define('TARSKI_RELEASE_BRANCH', #{TARSKI_VERSION}); end end -desc "Create a zip file of the lastest release in the downloads directory." -task :zip => :download do - puts "Creating zip file..." - %x{zip -rm #{PUBLIC_PATH}/downloads/tarski_#{TARSKI_VERSION}.zip #{TARSKI_DIR}} - puts "Done." +task :co_working_copy do + Dir.chdir(SRC_DIR) + `git clone #{GIT_REPO} #{TARSKI_DIRNAME}` if Dir.glob(TARSKI_DIRNAME).empty? end -desc "Export the latest release files." -task :download do - %x{rm -rf #{TARSKI_DIR}} - Rake::Task['git_export'].invoke +task :pull_master do + Dir.chdir(SRC_DIR + TARSKI_DIRNAME) + `git pull origin master` end -desc "Export the latest release from the Subversion repository." -task :svn_export do - puts "Downloading Tarski files..." - %x{svn export #{SVN_URL}/releases/#{TARSKI_VERSION} #{TARSKI_DIR}} +task :export do + src = SRC_DIR + TARSKI_DIRNAME + build = BUILD_DIR + TARSKI_DIRNAME + + `rm -rf #{build}` # Clean up any old exports + `cp -R #{src} #{build}` # Copy working tree to build directory + `rm -rf #{build}/.git` # Remove repository + `rm #{build}/.gitignore` # Remove dotfile end -desc "Export the latest release from a Git repository." -task :git_export do - here = Dir.pwd - there = "#{here}/#{TARSKI_DIR}" - puts "Cloning Git repository..." - %x{git clone #{GIT_REPO} #{there}} - Dir.chdir(there) - %x{git checkout -b #{TARSKI_VERSION} #{TARSKI_VERSION}} - puts "Pruning .git directory..." - %x{rm -rf #{there}/.git/} - %x{rm #{there}/.gitignore} - Dir.chdir(here) +desc "Create a zip file of the lastest release in the downloads directory." +task :zip => [:co_working_copy, :pull_master, :export] do + filename = "tarski_" + TARSKI_VERSION + ".zip" + + Dir.chdir(BUILD_DIR) + `zip -rm #{PUBLIC_DIR + "downloads/" + filename} \ + #{TARSKI_DIRNAME}` end Rakefile @@ -3,7 +3,7 @@ require 'find' class TarskiDocs def initialize(src_dir, options = {}) - @template = options[:template] || Dir.pwd + "/conf/hooks.erb" + @template = options[:template] || CONF_DIR + "hooks.erb" locate_src_files(src_dir) end lib/tarski_docs.rb @@ -23,13 +23,13 @@ class TarskiVersion xml = Builder::XmlMarkup.new(:target => @file, :indent => 2) xml.instruct! xml.feed :xmlns => "http://www.w3.org/2005/Atom", "xml:lang" => "en-GB" do - xml.title @config["title"] - xml.link :rel => "alternate", :href => @config["url"] - xml.link :rel => "self", :href => @config["url"] + File.basename(target) - xml.id @config["url"] + xml.title @config[:title] + xml.link :rel => "alternate", :href => @config[:url] + xml.link :rel => "self", :href => @config[:url] + File.basename(target) + xml.id @config[:url] xml.updated @datetime - @config["author"].each do |name| + @config[:author].each do |name| xml.author { xml.name name } end lib/tarski_version.rb 9f2ac1a9f8a6c05a8d565fc89d23af423e351347 Benedict Eastaugh benedict@eastaugh.net http://github.com/ionfish/tarski-utilities/commit/f2b7fffa92b0ddbdbcb726c7020a103d173f87c2 f2b7fffa92b0ddbdbcb726c7020a103d173f87c2 2009-08-11T16:40:59-07:00 2009-08-11T16:40:59-07:00 Modernisation of the Rake tasks. Everything is now built on cloning a local version of the Tarski Git repository, and operating on the resultant files in various ways. d9e0483181100572d1ef7082aa257935d1d3b08b Benedict Eastaugh benedict@eastaugh.net