factorylabs-fdlcap 0.3.2 → 0.3.3

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/fdlcap.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fdlcap}
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Factory Design Labs"]
@@ -46,6 +46,7 @@ Gem::Specification.new do |s|
      "lib/fdlcap/recipes/slice.rb",
      "lib/fdlcap/recipes/ssh.rb",
      "lib/fdlcap/recipes/stages.rb",
+     "lib/fdlcap/recipes/symlink_configs.rb",
      "lib/fdlcap/recipes/symlinks.rb",
      "lib/fdlcap/recipes/thin.rb",
      "lib/fdlcap/recipes/thinking_sphinx.rb",

data/lib/fdlcap/recipes/geminstaller.rb

@@ -40,11 +40,10 @@ Capistrano::Configuration.instance(:must_exist).load do
     # 
     # Callbacks
     #
-    before "deploy:check",           "geminstaller:add_remote_gem_dependencies"
-    after  "deploy:setup",           "geminstaller:install"
-    after  "geminstaller:install",   "geminstaller:run"
-    after  "deploy:symlink",         "geminstaller:run"
-    after  "geminstaller:run",       "deploy:migrate"
+    before "deploy:check",          "geminstaller:add_remote_gem_dependencies"
+    after  "deploy:setup",          "geminstaller:install"
+    after  "geminstaller:install",  "geminstaller:run"
+    after  "deploy:update",         "geminstaller:run"
   end
   
 end

data/lib/fdlcap/recipes/ruby_inline.rb

@@ -5,8 +5,8 @@ Capistrano::Configuration.instance(:must_exist).load do
     # Tasks
     #
     task :ruby_inline, :roles => :app, :except => {:no_release => true, :no_symlink => true} do
-      run "mkdir #{release_path}/tmp/ruby_inline/"
-      run "mkdir #{release_path}/tmp/ruby_inline/.ruby_inline"
+      run "mkdir -p #{release_path}/tmp/ruby_inline/"
+      run "mkdir -p #{release_path}/tmp/ruby_inline/.ruby_inline"
       sudo "chmod 755 #{release_path}/tmp/ruby_inline/"
       sudo "chmod 755 #{release_path}/tmp/ruby_inline/.ruby_inline"
     end

data/lib/fdlcap/recipes/symlink_configs.rb

@@ -0,0 +1,7 @@
+Capistrano::Configuration.instance(:must_exist).load do
+  
+  define_recipe :symlink_configs do
+    after "deploy:update_code",       "deploy:symlink_configs"
+  end
+  
+end

data/lib/fdlcap/recipes/thinking_sphinx.rb

@@ -3,10 +3,10 @@ Capistrano::Configuration.instance(:must_exist).load do
   
   # searchd assumes indexing and configuring being called directly on searchd
   define_recipe :thinking_sphinx do
-    after "deploy:update_code",       "deploy:symlink_configs"
     after "deploy:symlink_configs",   "thinking_sphinx:symlink"
     after "thinking_sphinx:symlink",  "sphinx:configure"
-    after "deploy:update",            "sphinx:reindex"
+    after "deploy:update",            "deploy:migrate"
+    after "deploy:migrate",           "sphinx:reindex"
   end
   
 end

data/lib/fdlcap/recipes.rb

@@ -6,23 +6,6 @@ require 'fdlcap/extensions/recipe_definition'
 require 'eycap/recipes'
 
 # Load up custom recipe chunks
-require 'fdlcap/recipes/autotagger'
-require 'fdlcap/recipes/craken'
-require 'fdlcap/recipes/database'
-require 'fdlcap/recipes/delayed_job'
-require 'fdlcap/recipes/deploy'
-require 'fdlcap/recipes/fdl_defaults'
-require 'fdlcap/recipes/geminstaller'
-require 'fdlcap/recipes/newrelic'
-require 'fdlcap/recipes/nginx'
-require 'fdlcap/recipes/performance'
-require 'fdlcap/recipes/rake'
-require 'fdlcap/recipes/rsync'
-require 'fdlcap/recipes/ruby_inline'
-require 'fdlcap/recipes/sass'
-require 'fdlcap/recipes/slice'
-require 'fdlcap/recipes/ssh'
-require 'fdlcap/recipes/stages'
-require 'fdlcap/recipes/symlinks'
-require 'fdlcap/recipes/thin'
-require 'fdlcap/recipes/thinking_sphinx'
+Dir.glob(File.join(File.dirname(__FILE__),'recipes','*.rb')).each do |file|
+  require file
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: factorylabs-fdlcap
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors: 
 - Factory Design Labs
@@ -93,6 +93,7 @@ files:
 - lib/fdlcap/recipes/slice.rb
 - lib/fdlcap/recipes/ssh.rb
 - lib/fdlcap/recipes/stages.rb
+- lib/fdlcap/recipes/symlink_configs.rb
 - lib/fdlcap/recipes/symlinks.rb
 - lib/fdlcap/recipes/thin.rb
 - lib/fdlcap/recipes/thinking_sphinx.rb