capistrano-wp 0.4.7 → 0.4.8

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OTVkMDRjNDBlOWU3ZjY2NjYxMjIxMTFiYTBmMDllYWNmMWY3MGUzNw==
+  data.tar.gz: !binary |-
+    MDMwOThmMjhlN2UzZGMxOWRjZmQzZTczZmQyOGMyMDY4MTQyOGQxMg==
+SHA512:
+  metadata.gz: !binary |-
+    N2I1MzhkM2MwYWE2OGRkMzk1ODUyYzFhZjlkYTE3OTdjZTM1YzA4NTMwMGY5
+    ZmZjNGNkZDJhMmIwN2Y0ZTA4OWNiN2U4MDIwMzEzZTI4ODM5OGY5ZmQ1NDM0
+    ZjkzMGVkZWQ3YjQzZTY1OTFiMTQ5ZTQ5MDNhMjE0YWM2NTMyMGQ=
+  data.tar.gz: !binary |-
+    ZGYwOTczYjBmODNlNDRjMjQ3NTJhNDc2NDZjY2U0YjE1Y2M3ZDdiMDE5MDc4
+    NTExZDUyY2RiNzg2NTUyZTE2NThiNjhmYzAzMGVkNzhjNzdlYWQ5NDE4YjE0
+    ZmQ2NjBhYjMyZmEyMmZkNjI2NjE3NTRjYzQxMDY0MDI2M2QzYzA=

data/README.md

@@ -17,7 +17,7 @@ also deploy multisite environments with WP at the root).
 ## Usage
 
 This is a plugin for the Capistrano deployment tool.  If you are unfamiliar
-with Capistrano, we would suggest at least familiarizing yoruself with
+with Capistrano, we would suggest at least familiarizing yourself with
 the general concepts outlined in the [Capistrano Wiki](https://github.com/capistrano/capistrano/wiki).
 
 ### Assumptions (Requirements)
@@ -56,7 +56,7 @@ For documentation regarding this portion of functionality, see the
 
 This gem handles WordPress via SVN directly from WordPress.org.
 
-In your main `config/deploy.rb` file you will see how to decalare what
+In your main `config/deploy.rb` file you will see how to declare what
 version of WordPress you wish to use by defining an SVN location
 like `branches/3.6`, `tags/3.6.1` or even `trunk`:
 
@@ -89,7 +89,7 @@ set :wordpress_version, false
 ### Persistent file/directory symlinks
 
 This gem augments the way capistrano handles directories you need to "persist"
-between releases.  Providing a declaritive interface for these items.
+between releases.  Providing a declarative interface for these items.
 
 There are some common directories that WordPress needs to act this way.  By
 default, if the following directories exist in the "shared" directory, they
@@ -155,7 +155,7 @@ set :wp_configs, [{
 You can follow the same steps as the symlinks for modification or addition
 to the default config copying rules.
 
-### Stage specfiic overrides
+### Stage specific overrides
 
 Stage specific overrides allow you to target specific configuration
 files to their respective stage.
@@ -176,7 +176,7 @@ This will place the proper `production-htaccess` file in the root of
 your next release, overriding any existing file of the same name.
 
 By default, it looks for the common `.htaccess` situation
-along withh `local-config.php`
+along with `local-config.php`
 
 ```ruby
 set :stage_specific_overrides, {
@@ -229,7 +229,7 @@ This gem by default checks the current release for modifications since
 it was deployed.  Either you're dealing with clients that like to make
 changes in production, or you have plugins that write configs and other
 things to the file system.  This step protects you against moving changes
-that have happend in the target stage out of use.
+that have happened in the target stage out of use.
 
 When deploying, if it detects a change it will stop the deploy process, and
 provide you with a listing of all the files that have been either added,
@@ -269,6 +269,16 @@ to a given file - deletion, creation, or content changes - while the other lists
 may be useful for more limited exclusions - for instance, a file that can be deleted
 but should never be changed if it remains present.
 
+### Enhanced :git capistrano scm module
+
+capistrano-wp includes a slight enhancement to the `:git` scm
+module.  The one shipped with Capistrano 2 does not gracefully
+handle submodules being removed in the repo; they stick around in
+the cached copy.
+
+The enhancement gives an extra -f to `git clean` to induce it to remove
+the submodule detritus, and also runs the clean in every submodule
+(with `git submodule foreach`).
 
 ## Development
 

data/VERSION

@@ -1 +1 @@
-0.4.7
+0.4.8

data/capistrano-wp.gemspec

@@ -2,14 +2,15 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: capistrano-wp 0.4.8 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "capistrano-wp"
-  s.version = "0.4.7"
+  s.version = "0.4.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Crowd Favorite"]
-  s.date = "2013-11-14"
+  s.date = "2014-01-29"
   s.description = "Recipes for deploying and maintaining remote WordPress installations with\nCapistrano.  Pulls in WordPress from SVN, optionally using a local or\nremote cache, and supports a number of common operations and tasks towards\nthe care and feeding of sites that may not be 100% maintained through\nversion control.\n"
   s.executables = ["capify-wp"]
   s.extra_rdoc_files = [
@@ -33,6 +34,7 @@ Gem::Specification.new do |s|
     "doc/examples/config/staging-local-config.php",
     "lib/capistrano-wp.rb",
     "lib/capistrano/crowdfavorite/wordpress.rb",
+    "lib/capistrano/recipes/deploy/scm/git-enhanced.rb",
     "lib/capistrano/templates/Capfile",
     "lib/capistrano/templates/config/deploy.rb",
     "lib/capistrano/templates/config/deploy/production.rb",
@@ -53,11 +55,11 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/crowdfavorite/gem-capistrano-wp"
   s.licenses = ["Apache License version 2"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.25"
+  s.rubygems_version = "2.1.11"
   s.summary = "Crowd Favorite WordPress Capistrano recipes"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<capistrano>, ["~> 2.15.3"])

data/lib/capistrano/recipes/deploy/scm/git-enhanced.rb

@@ -0,0 +1,55 @@
+require 'capistrano/recipes/deploy/scm/base'
+require 'capistrano/recipes/deploy/scm/git'
+
+module Capistrano
+  module Deploy
+    module SCM
+      class Git < Base
+        # Merges the changes to 'head' since the last fetch, for remote_cache
+        # deployment strategy
+        def sync(revision, destination)
+          git     = command
+          remote  = origin
+
+          execute = []
+          execute << "cd #{destination}"
+
+          # Use git-config to setup a remote tracking branches. Could use
+          # git-remote but it complains when a remote of the same name already
+          # exists, git-config will just silenty overwrite the setting every
+          # time. This could cause wierd-ness in the remote cache if the url
+          # changes between calls, but as long as the repositories are all
+          # based from each other it should still work fine.
+          if remote != 'origin'
+            execute << "#{git} config remote.#{remote}.url #{variable(:repository)}"
+            execute << "#{git} config remote.#{remote}.fetch +refs/heads/*:refs/remotes/#{remote}/*"
+          end
+
+          # since we're in a local branch already, just reset to specified revision rather than merge
+          execute << "#{git} fetch #{verbose} #{remote} && #{git} fetch --tags #{verbose} #{remote} && #{git} reset #{verbose} --hard #{revision}"
+
+          if variable(:git_enable_submodules)
+            execute << "#{git} submodule #{verbose} init"
+            execute << "#{git} submodule #{verbose} sync"
+            if false == variable(:git_submodules_recursive)
+              execute << "#{git} submodule #{verbose} update --init"
+            else
+              execute << %Q(export GIT_RECURSIVE=$([ ! "`#{git} --version`" \\< "git version 1.6.5" ] && echo --recursive))
+              execute << "#{git} submodule #{verbose} update --init $GIT_RECURSIVE"
+            end
+          end
+
+          # Make sure there's nothing else lying around in the repository (for
+          # example, a submodule that has subsequently been removed).
+          execute << "#{git} clean #{verbose} -d -x -f -f"
+
+          if variable(:git_enable_submodules)
+            execute << "#{git} submodule #{verbose} foreach $GIT_RECURSIVE #{git} clean #{verbose} -d -x -f -f"
+          end
+          execute.join(" && ")
+        end
+      end
+    end
+  end
+end
+

data/lib/crowdfavorite/wordpress.rb

@@ -16,6 +16,7 @@
 
 require 'crowdfavorite/tasks/wordpress'
 require 'crowdfavorite/tasks/localchanges'
+require 'capistrano/recipes/deploy/scm/git-enhanced'
 
 module CrowdFavorite::WordPress
   extend CrowdFavorite::Support::Namespace

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-wp
 version: !ruby/object:Gem::Version
-  version: 0.4.7
-  prerelease: 
+  version: 0.4.8
 platform: ruby
 authors:
 - Crowd Favorite
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-14 00:00:00.000000000 Z
+date: 2014-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano-ext
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: railsless-deploy
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -142,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano-spec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -191,6 +172,7 @@ files:
 - doc/examples/config/staging-local-config.php
 - lib/capistrano-wp.rb
 - lib/capistrano/crowdfavorite/wordpress.rb
+- lib/capistrano/recipes/deploy/scm/git-enhanced.rb
 - lib/capistrano/templates/Capfile
 - lib/capistrano/templates/config/deploy.rb
 - lib/capistrano/templates/config/deploy/production.rb
@@ -210,26 +192,25 @@ files:
 homepage: http://github.com/crowdfavorite/gem-capistrano-wp
 licenses:
 - Apache License version 2
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Crowd Favorite WordPress Capistrano recipes
 test_files: []