Merge pull request pengwynn#4 from pepijndevos/master

Minimal maintenance update

.gitignore

@@ -13,9 +13,6 @@ tmtags
 ## VIM
 *.swp
 
-## PROJECT::GENERAL
-coverage
-rdoc
 pkg
-
-## PROJECT::SPECIFIC
+thematic
+wordpress

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Wynn Netherland / Adam Stacoviak
+Copyright (c) 2009 Wynn Netherland / Adam Stacoviak / Pepijn de Vos
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

README.markdown

@@ -20,30 +20,23 @@ To install a theme into your existing compass project, add the following to your
 
 OR, just run this command:
 
-    compass -r compass-wordpress -f wordpress --sass-dir=sass --css-dir=css -s compressed -p <Theme Name> /path/to/installation
+    compass create -r compass-wordpress --using wordpress -s compressed <name>
 
 What this does is call `compass`, requires the compass-wordpress extension, uses the framework wordpress, sets the sass and css directories, sets the Sass output to be compressed and finally ends with you setting the theme name.
 
 Read more details at [Wynn's blog](http://wynnnetherland.com/2009/11/sass-up-your-wordpress-themes-with-compass/).
 
 ** As of this version, we only have support for Thematic developed. Suggest one to use, or fork the project and take a stab at it yourself. Either way, get in touch we want to hear from you.
-
-Supported Theme Options
-========================
-
-* project (default)
-* thematic
 
 Note on Patches/Pull Requests
 ==============================
 
 * Fork the project!
 * Develop your feature or bug fix.
-* Add tests for it. This is IMPORTANT so your work doesn't get broken in a future version unintentionally.
 * Commit, do not mess with rakefile, version, or history. (if you want to have your own version that's fine, but bump version in a commit by itself so it can be ignored when pulled)
 * Send your pull request. Bonus points for usage of topic branches.
 
 Copyright
 ===========
 
-Copyright (c) 2009 Wynn Netherland / Adam Stacoviak. See LICENSE for details.
+Copyright (c) 2009 Wynn Netherland / Adam Stacoviak / Pepijn de Vos. See LICENSE for details.

Rakefile

@@ -1,17 +1,28 @@
 require 'rubygems'
 require 'rake'
 
+def compass_version()
+  begin
+    require 'compass'
+    return ">= "+ Compass::VERSION
+  rescue LoadError
+    return ">= 0.10.6"
+  end
+end
+
+
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "compass-wordpress"
     gem.summary = %Q{Compass extenstion for creating WordPress themes using Sass}
-    gem.description = %Q{Helps you create generic WordPress themes and Thematic child themes}
-    gem.email = "wynn.netherland@gmail.com"
-    gem.homepage = "http://github.com/pengwynn/compass-wordpress"
-    gem.authors = ["Wynn Netherland", "Adam Stacoviak"]
-    gem.add_development_dependency "compass", "~> 0.8.17"
-    gem.files = FileList["[A-Z]*", "{lib,sass,templates}/**/*"]
+    gem.description = %Q{Helps you create Thematic child themes}
+    gem.email = "pepijndevos@gmail.com"
+    gem.homepage = "http://github.com/pepijndevos/compass-wordpress"
+    gem.authors = ["Wynn Netherland", "Adam Stacoviak", "Pepijn de Vos"]
+    gem.add_dependency "compass", compass_version
+    #gem.files = FileList["[A-Z]*", "{lib,sass,templates}/**/*"]
+    gem.files.include "wordpress/**/*"
 
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end

VERSION

@@ -1 +1 @@
-0.1.4
+0.2.0

build.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+compass create wordpress --using compass/extension --syntax sass
+svn export http://thematic.googlecode.com/svn/trunk/ thematic
+
+cp -r thematic/thematicsamplechildtheme/ wordpress/templates/project/
+echo "discover :all" >> wordpress/templates/project/manifest.rb
+sed -i '' '/*\//,$ d' wordpress/templates/project/style.css
+echo "*/
+
+@import url('stylesheets/screen.css');" >> wordpress/templates/project/style.css
+echo "
+@import 'wordpress'" >> wordpress/templates/project/screen.sass
+
+sass-convert --from css --to sass --recursive thematic/library wordpress/stylesheets
+
+for file in wordpress/stylesheets/*/*.sass
+do
+	mv $file `echo $file | sed -E "s/([^\/]*)$/_\\1/"`
+done
+
+find wordpress/stylesheets/*/* | \
+	sed -E "s/.*\/([^\/]*\/[^\/]*\.sass)$/@import '\\1'/" >> \
+	wordpress/stylesheets/_wordpress.sass
+
+echo "Please edit _wordpress.sass to reflect sensible defaults."
+echo "Use Rake to build, install and publish compass-wordpress."

compass-wordpress.gemspec

@@ -1,94 +1,65 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{compass-wordpress}
-  s.version = "0.1.4"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Wynn Netherland", "Adam Stacoviak"]
-  s.date = %q{2009-12-10}
-  s.description = %q{Helps you create generic WordPress themes and Thematic child themes}
-  s.email = %q{wynn.netherland@gmail.com}
+  s.authors = ["Wynn Netherland", "Adam Stacoviak", "Pepijn de Vos"]
+  s.date = %q{2010-12-25}
+  s.description = %q{Helps you create Thematic child themes}
+  s.email = %q{pepijndevos@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.markdown"
+    "README.markdown"
   ]
   s.files = [
     "LICENSE",
-     "README.markdown",
-     "Rakefile",
-     "VERSION",
-     "lib/compass-wordpress.rb",
-     "lib/wordpress/compass_extension.rb",
-     "sass/wordpress/thematic/_extensions.sass",
-     "sass/wordpress/thematic/_styles.sass",
-     "sass/wordpress/thematic/extensions/_typography.sass",
-     "sass/wordpress/thematic/styles/_2c_l_fixed.sass",
-     "sass/wordpress/thematic/styles/_2c_r_fixed.sass",
-     "sass/wordpress/thematic/styles/_3c_fixed.sass",
-     "sass/wordpress/thematic/styles/_3c_r_fixed.sass",
-     "sass/wordpress/thematic/styles/_3c_r_fixed_primary.sass",
-     "sass/wordpress/thematic/styles/_default.sass",
-     "sass/wordpress/thematic/styles/_images.sass",
-     "sass/wordpress/thematic/styles/_plugins.sass",
-     "sass/wordpress/thematic/styles/_typography.sass",
-     "templates/base/404.php",
-     "templates/base/LICENSE.txt",
-     "templates/base/README.txt",
-     "templates/base/_base.sass",
-     "templates/base/archive.php",
-     "templates/base/archives.php",
-     "templates/base/comments.php",
-     "templates/base/extensions/_border_radius.sass",
-     "templates/base/footer.php",
-     "templates/base/functions.php",
-     "templates/base/header.php",
-     "templates/base/image.php",
-     "templates/base/index.php",
-     "templates/base/javascript/site.js",
-     "templates/base/links.php",
-     "templates/base/manifest.rb",
-     "templates/base/page-custom.php",
-     "templates/base/page.php",
-     "templates/base/print.sass",
-     "templates/base/screen.sass",
-     "templates/base/screenshot.png",
-     "templates/base/search.php",
-     "templates/base/sidebar.php",
-     "templates/base/single.php",
-     "templates/base/style.css",
-     "templates/project/manifest.rb",
-     "templates/project/print.sass",
-     "templates/project/readme.txt",
-     "templates/project/screen.sass",
-     "templates/project/style.css",
-     "templates/thematic/extensions/_border_radius.sass",
-     "templates/thematic/functions.php",
-     "templates/thematic/manifest.rb",
-     "templates/thematic/print.sass",
-     "templates/thematic/readme.txt",
-     "templates/thematic/screen.sass",
-     "templates/thematic/style.css"
+    "README.markdown",
+    "Rakefile",
+    "VERSION",
+    "build.sh",
+    "compass-wordpress.gemspec",
+    "lib/compass-wordpress.rb",
+    "wordpress/stylesheets/_wordpress.sass",
+    "wordpress/stylesheets/layouts/_2c-l-fixed.sass",
+    "wordpress/stylesheets/layouts/_2c-r-fixed.sass",
+    "wordpress/stylesheets/layouts/_3c-fixed.sass",
+    "wordpress/stylesheets/layouts/_3c-r-fixed-primary.sass",
+    "wordpress/stylesheets/layouts/_3c-r-fixed.sass",
+    "wordpress/stylesheets/styles/_18px.sass",
+    "wordpress/stylesheets/styles/_21px.sass",
+    "wordpress/stylesheets/styles/_classic.sass",
+    "wordpress/stylesheets/styles/_default.sass",
+    "wordpress/stylesheets/styles/_images.sass",
+    "wordpress/stylesheets/styles/_plugins.sass",
+    "wordpress/stylesheets/styles/_reset.sass",
+    "wordpress/stylesheets/styles/_typography.sass",
+    "wordpress/templates/project/functions.php",
+    "wordpress/templates/project/manifest.rb",
+    "wordpress/templates/project/readme.txt",
+    "wordpress/templates/project/screen.sass",
+    "wordpress/templates/project/style.css"
   ]
-  s.homepage = %q{http://github.com/pengwynn/compass-wordpress}
-  s.rdoc_options = ["--charset=UTF-8"]
+  s.homepage = %q{http://github.com/pepijndevos/compass-wordpress}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Compass extenstion for creating WordPress themes using Sass}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<compass>, ["~> 0.8.17"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<compass>, [">= 0.10.6"])
     else
-      s.add_dependency(%q<compass>, ["~> 0.8.17"])
+      s.add_dependency(%q<compass>, [">= 0.10.6"])
     end
   else
-    s.add_dependency(%q<compass>, ["~> 0.8.17"])
+    s.add_dependency(%q<compass>, [">= 0.10.6"])
   end
 end
+

lib/compass-wordpress.rb

@@ -1,4 +1,2 @@
-require 'rubygems'
-gem 'compass', '~> 0.8.17'
-require 'compass'
-require File.join(File.dirname(__FILE__), 'wordpress', 'compass_extension')
+base_directory  = File.join(File.dirname(__FILE__), '..', 'wordpress')
+Compass::Frameworks.register('wordpress', :path => base_directory)