factorylabs-fdlcap 0.3.1 → 0.3.2

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/fdlcap.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fdlcap}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Factory Design Labs"]
-  s.date = %q{2009-06-26}
+  s.date = %q{2009-06-29}
   s.default_executable = %q{fdlcap}
   s.email = %q{interactive@factorylabs.com}
   s.executables = ["fdlcap"]
@@ -26,7 +26,6 @@ Gem::Specification.new do |s|
      "features/step_definitions/fdlcap_steps.rb",
      "features/support/env.rb",
      "lib/fdlcap.rb",
-     "lib/fdlcap/defaults.rb",
      "lib/fdlcap/extensions/configuration.rb",
      "lib/fdlcap/extensions/recipe_definition.rb",
      "lib/fdlcap/recipes.rb",
@@ -35,6 +34,7 @@ Gem::Specification.new do |s|
      "lib/fdlcap/recipes/database.rb",
      "lib/fdlcap/recipes/delayed_job.rb",
      "lib/fdlcap/recipes/deploy.rb",
+     "lib/fdlcap/recipes/fdl_defaults.rb",
      "lib/fdlcap/recipes/geminstaller.rb",
      "lib/fdlcap/recipes/newrelic.rb",
      "lib/fdlcap/recipes/nginx.rb",

data/lib/fdlcap/recipes/fdl_defaults.rb

@@ -0,0 +1,10 @@
+Capistrano::Configuration.instance(:must_exist).load do
+  
+  define_recipe :fdl_defaults do
+    # defaults for fdl
+    set :scm,           :git
+    set :keep_releases, 5
+    set :deploy_via,    :remote_cache
+  end
+  
+end

data/lib/fdlcap/recipes/thinking_sphinx.rb

@@ -2,18 +2,11 @@ Capistrano::Configuration.instance(:must_exist).load do
   # These recipies assume an engineyard configuration
   
   # searchd assumes indexing and configuring being called directly on searchd
-  define_recipe :thinking_sphinx_searchd do
+  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"
   end
   
-  # rake assumes the explicit ey cap tasks that call TS rake tasks for indexing and configuring
-  define_recipe :thinking_sphinx_rake do
-    after "deploy:update_code",       "deploy:symlink_configs"
-    after "deploy:symlink_configs",   "thinking_sphinx:symlink"
-    after "thinking_sphinx:symlink",  "thinking_sphinx:configure"
-    after "deploy:update",            "thinking_sphinx:reindex"
-  end
 end

data/lib/fdlcap/recipes.rb

@@ -2,9 +2,6 @@
 require 'fdlcap/extensions/configuration'
 require 'fdlcap/extensions/recipe_definition'
 
-# Set up configuration defaults
-require 'fdlcap/defaults'
-
 # Load external fdlcap dependencies
 require 'eycap/recipes'
 
@@ -14,6 +11,7 @@ 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'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: factorylabs-fdlcap
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Factory Design Labs
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-26 00:00:00 -07:00
+date: 2009-06-29 00:00:00 -07:00
 default_executable: fdlcap
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,7 +73,6 @@ files:
 - features/step_definitions/fdlcap_steps.rb
 - features/support/env.rb
 - lib/fdlcap.rb
-- lib/fdlcap/defaults.rb
 - lib/fdlcap/extensions/configuration.rb
 - lib/fdlcap/extensions/recipe_definition.rb
 - lib/fdlcap/recipes.rb
@@ -82,6 +81,7 @@ files:
 - lib/fdlcap/recipes/database.rb
 - lib/fdlcap/recipes/delayed_job.rb
 - lib/fdlcap/recipes/deploy.rb
+- lib/fdlcap/recipes/fdl_defaults.rb
 - lib/fdlcap/recipes/geminstaller.rb
 - lib/fdlcap/recipes/newrelic.rb
 - lib/fdlcap/recipes/nginx.rb

data/lib/fdlcap/defaults.rb

@@ -1,8 +0,0 @@
-Capistrano::Configuration.instance(:must_exist).load do
-  
-  # defaults for fdl
-  set :scm,           :git
-  set :keep_releases, 5
-  set :deploy_via,    :remote_cache
-  
-end