wp-capistrano 0.3.0 → 0.3.1

data/README.rdoc

@@ -56,6 +56,10 @@ If there exists wp-content/themes/*/*/sass_output.php it will be executed locall
 
 A sample sass_output.php can be found in wp-generate ( http://github.com/dxw/wp-generate ).
 
+=== Compass
+
+If there's a compass config file in the theme, it will be found and compiled locally, and the stylesheets directory will be uploaded to the correct place.
+
 === htaccess
 
 Uploads ./htaccess to .htaccess if it exists.

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/manifest-yml.rb

@@ -0,0 +1,46 @@
+# encoding: utf-8
+
+class ManifestYML
+  attr_accessor :files
+
+  def initialize f
+    @files = []
+    y = YAML.load_file f
+
+    # Files is deprecated
+    files = %w[Files Static Executable Invisible]
+    for f in files
+      if y[f]
+        @files += glob(y[f])
+      end
+    end
+
+    if y['Manifests']
+      glob(y['Manifests']).each do |m|
+        pwd = File.dirname(m)
+        Dir.chdir pwd do
+          newfiles = ManifestYML.new(File.basename(m)).files
+          @files += newfiles.map{|f|File.join(pwd, f)}
+        end
+      end
+    end
+  end
+
+  def each_file &block
+    @files.each &block
+  end
+
+  def glob patterns
+    fi = []
+    patterns.each do |pat|
+      f = Dir.glob pat
+
+      if f.length < 1
+        raise RuntimeError, "Pattern #{pat} returned no matches"
+      end
+      fi += f
+    end
+
+    fi
+  end
+end

data/lib/wp-capistrano.rb

@@ -1,14 +1,19 @@
+# encoding: utf-8
+
 require 'erb'
 require 'digest'
 require 'digest/sha1'
 
+require 'manifest-yml'
 require 'wp-config'
 require 'wp-capistrano/deploy'
 require 'wp-capistrano/setup'
 
 # Features
 require 'wp-capistrano/feature/cforms'
+require 'wp-capistrano/feature/compass'
 require 'wp-capistrano/feature/htaccess'
+require 'wp-capistrano/feature/makefile-manifest'
 require 'wp-capistrano/feature/plugin-install'
 require 'wp-capistrano/feature/sass'
 require 'wp-capistrano/feature/shared-dirs'
@@ -24,6 +29,7 @@ Capistrano::Configuration.instance.load do
   def set_target target
     tt = WPConfig.instance.h['deploy'][target]
     if tt
+      set :deploy_target, target
       t = OpenStruct.new(tt)
       set :domain, t.ssh_domain
       set :user, t.ssh_user
@@ -61,11 +67,11 @@ Capistrano::Configuration.instance.load do
   set :wordpress_version, WPConfig.wordpress.version
   set :wordpress_git_url, WPConfig.wordpress.repository
   set :repository, WPConfig.application.repository
+  set :branch, WPConfig.application.version
 
   # Everything else
   set :scm, "git"
   set :deploy_via, :remote_cache
-  set :branch, "master"
   set :git_shallow_clone, 1
   set :git_enable_submodules, 1
   set :wordpress_db_host, "localhost"

data/lib/wp-capistrano/deploy.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 Capistrano::Configuration.instance.load do
   namespace :deploy do
 
@@ -26,7 +28,8 @@ Capistrano::Configuration.instance.load do
 
       set :content_dirs, {'themes' => :copy,
                           'uploads' => :copy,
-                          'plugins' => :copy}
+                          'plugins' => :copy,
+                          'languages' => :copy}
 
       deploy.content_dirs_configure
 
@@ -34,9 +37,11 @@ Capistrano::Configuration.instance.load do
         dest = "#{latest_release}/finalized/wp-content/"
         case action
         when :copy
-          run "cp -rv #{latest_release}/#{dir} #{dest}"
+          src = "#{latest_release}/#{dir}"
+          run "[ -e #{src} ] && cp -rv #{src} #{dest} || true"
         when :link then 'ln -s'
-          run "ln -s #{shared_path}/#{dir} #{dest}"
+          src = "#{shared_path}/#{dir}"
+          run "[ -e #{src} ] && ln -s #{src} #{dest} || true"
         end
       end
 
@@ -65,6 +70,8 @@ Capistrano::Configuration.instance.load do
       # For certain cases we may allow the user write access (i.e. module plugin-install)
       # it should always be direct filesystem access (and WordPress' autodetection is pants)
       preconfig['FS_METHOD'] = "'direct'"
+      # Generally speaking we don't want file editing
+      preconfig['DISALLOW_FILE_EDIT'] = 'true'
 
       # Allow modules a chance to interfere
       deploy.wp_config_configure

data/lib/wp-capistrano/feature/cforms.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 # Make the cforms plugin work
 
 Capistrano::Configuration.instance.load do

data/lib/wp-capistrano/feature/compass.rb

@@ -0,0 +1,53 @@
+# encoding: utf-8
+
+# Assumes you're using DXW's sass_output.php convention
+# A sample can be found in dxw/wp-generate:
+# http://github.com/dxw/wp-generate/blob/master/lib/wp_generate/templates/theme/sass/sass_output.php
+
+begin
+  require 'compass'
+
+  Capistrano::Configuration.instance.load do
+    after 'deploy:finalize_update' do
+
+      Dir.glob("themes/*").each do |theme_dir|
+
+        # Config
+        cfg_file = Compass.detect_configuration_file(theme_dir)
+
+        if cfg_file
+          cfg = Compass.add_project_configuration(cfg_file)
+          abs_css = File.expand_path(File.join(theme_dir, cfg.css_path))
+
+          # Compile
+          compiled = system("compass compile --trace --force --output-style compressed #{theme_dir}")
+          #TODO: do this instead
+          #Compass.compiler.options[:style] = :compressed
+          #Compass.compiler.run
+
+          if compiled
+
+            # Path fiddling
+
+            pwd = File.expand_path(Dir.pwd)
+
+            unless pwd == abs_css[0...pwd.length]
+              raise RuntimeError, 'opps'
+            end
+
+            relative_css = abs_css[pwd.length+1..-1]
+
+            remote_css = "#{latest_release}/finalized/wp-content/#{relative_css}"
+
+            # Upload
+            top.upload(abs_css, remote_css, :via => :scp, :recursive => true)
+
+          end
+        end
+      end
+    end
+  end
+
+rescue LoadError
+  # Don't die horribly
+end

data/lib/wp-capistrano/feature/htaccess.rb

@@ -1,9 +1,60 @@
+# encoding: utf-8
+
 # Custom htaccess
 
 Capistrano::Configuration.instance.load do
   after 'deploy:finalize_update' do
     if File.exist? 'htaccess'
+
       top.upload("htaccess", "#{latest_release}/finalized/.htaccess" , :via => :scp)
+
+    else
+
+      htaccess = <<END
+# BEGIN WordPress
+<IfModule mod_rewrite.c>
+RewriteEngine On
+RewriteBase /
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-d
+RewriteRule . /index.php [L]
+</IfModule>
+# END WordPress
+END
+
+      if deploy_profile.modules.include? 'wp-super-cache'
+        htaccess = <<END + htaccess
+# BEGIN WPSuperCache
+<IfModule mod_rewrite.c>
+RewriteEngine On
+RewriteBase /
+AddDefaultCharset UTF-8
+RewriteCond %{REQUEST_URI} !^.*[^/]$
+RewriteCond %{REQUEST_URI} !^.*//.*$
+RewriteCond %{REQUEST_METHOD} !POST
+RewriteCond %{QUERY_STRING} !.*=.*
+RewriteCond %{HTTP:Cookie} !^.*(comment_author_|wordpress|wp-postpass_).*$
+RewriteCond %{HTTP:Accept-Encoding} gzip
+RewriteCond %{DOCUMENT_ROOT}/wp-content/cache/supercache/%{HTTP_HOST}/$1/index.html.gz -f
+RewriteRule ^(.*) /wp-content/cache/supercache/%{HTTP_HOST}/$1/index.html.gz [L]
+
+RewriteCond %{REQUEST_URI} !^.*[^/]$
+RewriteCond %{REQUEST_URI} !^.*//.*$
+RewriteCond %{REQUEST_METHOD} !POST
+RewriteCond %{QUERY_STRING} !.*=.*
+RewriteCond %{HTTP:Cookie} !^.*(comment_author_|wordpress|wp-postpass_).*$
+RewriteCond %{DOCUMENT_ROOT}/wp-content/cache/supercache/%{HTTP_HOST}/$1/index.html -f
+RewriteRule ^(.*) /wp-content/cache/supercache/%{HTTP_HOST}/$1/index.html [L]
+</IfModule>
+# END WPSuperCache
+END
+      end
+
+      put(htaccess, "#{latest_release}/finalized/.htaccess", :via => :scp)
+
     end
+
+    run("chmod 755 #{latest_release}/finalized/.htaccess")
+
   end
 end

data/lib/wp-capistrano/feature/makefile-manifest.rb

@@ -0,0 +1,24 @@
+# encoding: utf-8
+
+# Runs make deploy in the root of the project if Makefile is found
+# And uploads any files listed in Manifest.yml
+
+Capistrano::Configuration.instance.load do
+  after 'deploy:finalize_update' do
+
+    # Makefiles
+    if File.exist? 'Makefile'
+      unless system 'make deploy'
+        raise RuntimeError, 'make deploy failed'
+      end
+    end
+
+    # ... and Manifests
+    if File.exist? 'Manifest.yml'
+      ManifestYML.new('Manifest.yml').each_file do |f|
+        top.upload(f, "#{latest_release}/finalized/wp-content/#{f}")
+      end
+    end
+
+  end
+end

data/lib/wp-capistrano/feature/plugin-install.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 # Allow plugin installation by end-users
 
 Capistrano::Configuration.instance.load do

data/lib/wp-capistrano/feature/sass.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 # Assumes you're using DXW's sass_output.php convention
 # A sample can be found in dxw/wp-generate:
 # http://github.com/dxw/wp-generate/blob/master/lib/wp_generate/templates/theme/sass/sass_output.php

data/lib/wp-capistrano/feature/shared-dirs.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 # Shared directories get uploaded at setup-time and don't change
 
 Capistrano::Configuration.instance.load do
@@ -58,10 +60,6 @@ Capistrano::Configuration.instance.load do
   end
 
   before 'deploy:content_dirs_configure' do
-    p 'hihi'
-
-    p shared_dirs
-
     shared_dirs.each do |dir|
       content_dirs[dir] = :link
     end

data/lib/wp-capistrano/feature/wp-super-cache.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 # WP Super Cache
 
 Capistrano::Configuration.instance.load do
@@ -14,23 +16,23 @@ Capistrano::Configuration.instance.load do
       top.upload("plugins/wp-super-cache/advanced-cache.php", "#{latest_release}/finalized/wp-content/" , :via => :scp)
       sedable_path = "#{latest_release}/finalized/wp-content/plugins/wp-super-cache/".gsub(/\//,'\/')
       run("sed -i 's/CACHEHOME/#{sedable_path}/g' #{latest_release}/finalized/wp-content/advanced-cache.php")
-    else
-      raise IOError, 'Are you sure you have the WP Super Cache plugin?'
+    elsif deploy_profile.modules.include? 'wp-super-cache'
+      raise IOError, 'Are you sure you have the WP Super Cache plugin? Could not find advanced-cache.php'
     end
 
     if File.exist? 'wp-cache-config.php'
       top.upload("wp-cache-config.php", "#{latest_release}/finalized/wp-content/" , :via => :scp)
     elsif File.exist? 'plugins/wp-super-cache/wp-cache-config-sample.php'
       top.upload("plugins/wp-super-cache/wp-cache-config-sample.php", "#{latest_release}/finalized/wp-content/wp-cache-config.php" , :via => :scp)
-    else
-      raise IOError, 'Are you sure you have the WP Super Cache plugin?'
+    elsif deploy_profile.modules.include? 'wp-super-cache'
+      raise IOError, 'Are you sure you have the WP Super Cache plugin? Could not find wp-cache-config.php'
     end
 
-    run("mkdir -p #{latest_release}/finalized/wp-content/cache/blogs &&
-         mkdir -p #{latest_release}/finalized/wp-content/cache/meta")
-
-    # Keep writables to a bare minimum
+    # Keep writable directories to a bare minimum
     if deploy_profile.modules.include? 'wp-super-cache'
+      run("mkdir -p #{latest_release}/finalized/wp-content/cache/blogs &&
+           mkdir -p #{latest_release}/finalized/wp-content/cache/meta")
+
       run("chmod -R 777 #{latest_release}/finalized/wp-content/cache &&
            chmod -R 777 #{latest_release}/finalized/wp-content/wp-cache-config.php")
     end

data/lib/wp-capistrano/setup.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 Capistrano::Configuration.instance.load do
   namespace :setup do
 
@@ -16,7 +18,7 @@ Capistrano::Configuration.instance.load do
       run "rm -rf #{shared_path}/wordpress || true"
       raise Exception, 'wordpress.repository must be set in config.yml' if wordpress_git_url.nil?
       run "git clone --depth 1 #{wordpress_git_url} #{shared_path}/wordpress"
-      run "cd #{shared_path}/wordpress && git fetch --tags && git checkout #{wordpress_version}"
+      run "cd #{shared_path}/wordpress && git fetch --tags && git reset --hard HEAD && git checkout #{wordpress_version}"
     end
 
     desc "Sets up shared wp-config.php"

data/lib/wp-config.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+# encoding: utf-8
 
 require 'singleton'
 

data/lib/wp_capistrano/deploy.rb

@@ -1,2 +1,4 @@
+# encoding: utf-8
+
 warn "[DeprecationWarning] Capfile should not require 'wp_capistrano/deploy' - require 'wp-capistrano instead'"
 require 'wp-capistrano' # Compatability

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - The Dextrous Web
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-02 00:00:00 +01:00
+date: 2011-04-11 00:00:00 -04:00
 default_executable: wpcapify
 dependencies: []
 
@@ -27,16 +27,18 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- .gitignore
 - LICENCE
 - README.rdoc
 - Rakefile
 - VERSION
 - bin/wpcapify
+- lib/manifest-yml.rb
 - lib/wp-capistrano.rb
 - lib/wp-capistrano/deploy.rb
 - lib/wp-capistrano/feature/cforms.rb
+- lib/wp-capistrano/feature/compass.rb
 - lib/wp-capistrano/feature/htaccess.rb
+- lib/wp-capistrano/feature/makefile-manifest.rb
 - lib/wp-capistrano/feature/plugin-install.rb
 - lib/wp-capistrano/feature/sass.rb
 - lib/wp-capistrano/feature/shared-dirs.rb
@@ -50,11 +52,12 @@ homepage: http://github.com/dxw/wp-capistrano
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -62,6 +65,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -71,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Capistrano receipe for WordPress

data/.gitignore

@@ -1,2 +0,0 @@
-pkg/
-wp-capistrano.gemspec