easy-deployment 0.1.1 → 0.1.2

data/easy-deployment.gemspec

@@ -2,8 +2,8 @@
 require File.expand_path('../lib/easy-deployment/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors          = ["Jeremy Olliver", "Nigel Ramsay", "Shevaun Coker"]
-  gem.email             =  ["jeremy.olliver@gmail.com", "nigel.ramsay@abletech.co.nz", "shevaun.coker@abletech.co.nz"]
+  gem.authors          = ["Jeremy Olliver", "Nigel Ramsay", "Shevaun Coker", "Cameron Fowler"]
+  gem.email             =  ["jeremy.olliver@gmail.com", "nigel.ramsay@abletech.co.nz", "shevaun.coker@abletech.co.nz", "hiding.in.a.box@gmail.com"]
   gem.description    = %q{Easy deployment: includes a generator, and capistrano configuration}
   gem.summary       = %q{Gem for encapsulating abletech's deployment practices}
   gem.homepage     = ""

data/lib/easy-deployment/version.rb

@@ -1,5 +1,5 @@
 module Easy
   module Deployment
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/lib/easy/deployment/apache.rb

@@ -5,7 +5,8 @@ Capistrano::Configuration.instance(:must_exist).load do
   namespace :apache do
     desc "Configure this site & Reload the apache configuration"
     task :configure, :roles => :app, :except => { :no_release => true } do
-      run "cp -f #{current_path}/config/deploy/#{stage}/apache/* /etc/apache2/sites-enabled/"
+      run "cp -f #{current_path}/config/deploy/#{stage}/apache.conf /etc/apache2/sites-available/#{application}"
+      run "ln -fs /etc/apache2/sites-available/#{application} /etc/apache2/sites-enabled/#{application}"
     end
 
     [:stop, :start, :restart].each do |action|
@@ -16,5 +17,6 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
   end
 
+  before 'deploy:start', 'apache:configure'
   after 'apache:configure', 'apache:restart'
 end

data/lib/easy/deployment/capistrano.rb

@@ -9,14 +9,12 @@ Capistrano::Configuration.instance(:must_exist).load do
   default_run_options[:pty] = true
 
   namespace :deploy do
-    desc "Initial deploy including database creation and apache2 config setup"
+    desc "Initial deploy including database creation and triggers hooks on start. Require 'easy/deployment/apache' to configure and restart apache as part of this task, and require 'easy/deployment/logrotate' to setup logrotate as part of this task"
     task :initial do
       set :migrate_target, :latest
       update # updates_code and creates symlink
       create_db
       migrate
-      top.namespace(:logrotate) {setup}
-      top.namespace(:apache)    {configure; restart}
       start # doesn't do anything but triggers associated hooks
     end
 
@@ -67,13 +65,5 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
   end
 
-  namespace :web do
-    desc "Deprecated - use apache:configure instead"
-    task :configure, :roles => :app, :except => { :no_release => true } do
-      puts "Deprecated - use apache:configure instead"
-    end
-  end
-
-
   before 'deploy:update_code',  'deploy:set_branch' # allow specification of branch, tag or commit on the command line
 end

data/lib/easy/deployment/logrotate.rb

@@ -6,4 +6,6 @@ Capistrano::Configuration.instance(:must_exist).load do
       run "cp #{current_path}/config/deploy/#{stage}/logrotate.conf /etc/logrotate.d/#{application}.conf"
     end
   end
+
+  before 'deploy:start', 'logrotate:setup'
 end

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: easy-deployment
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
 - Jeremy Olliver
 - Nigel Ramsay
 - Shevaun Coker
+- Cameron Fowler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-27 00:00:00.000000000 Z
+date: 2012-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -114,6 +115,7 @@ email:
 - jeremy.olliver@gmail.com
 - nigel.ramsay@abletech.co.nz
 - shevaun.coker@abletech.co.nz
+- hiding.in.a.box@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -153,12 +155,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4265744311530263395
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4265744311530263395
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -168,4 +176,3 @@ summary: Gem for encapsulating abletech's deployment practices
 test_files:
 - spec/easy_deployment_spec.rb
 - spec/spec_helper.rb
-has_rdoc: