easy-deployment 0.4.4 → 0.5.0

data/CHANGELOG.md

@@ -0,0 +1,76 @@
+# Changelog for easy-deployment
+
+## 0.5.0 (unreleased)
+
+Large rewrite of both templates, and generator code.
+
+Major new feature is generation of backup config using the gems `whenever` and `backup`
+
+Enhancements:
+
+* Now fixed to capistrano 2.13.5 - dependencies on external capistrano-ext and capistrano_colors are removed.
+* Added annotation task to write branch name, git revision, time of deploy, and user to the application root as version.txt
+* Removed messy optparse code, and let Thor handle option parsing
+* `deploy.rb` template now displays all feature modules, with some optional ones commented out
+* `deploy.rb` template is now updated with current deployment practices (including newrelic and bugsnag services)
+* Added generator to create backup configuration - for scheduling cron jobs to backup application data to S3
+
+Bug Fixes:
+
+* `deploy.rb` and `staging.rb` etc files are rendered correctly as templates, instead of copied over without rendering
+* use `deploy:create_symlink` instead of deprecated `deploy:symlink`
+
+## 0.4.4 - 2013-01-11
+
+Bug Fixes:
+
+* Bugfix for previous niet role definition, variable should be delayed being evaluated
+
+## 0.4.3 - 2013-01-10
+
+Enhancements:
+
+* the server role for the niet tasks are now configurable via `set :niet_roles, [:job]`
+
+## 0.4.2 - 2013-01-09
+
+Enhancements:
+
+* path to the binary apachectl command is now able to be configured via `set :apachectl_bin`
+* Added documentation to README.md for several of the optional features
+
+## 0.4.1 - 2012-12-10
+
+Bug Fixes:
+
+* raise exception if `cap niet:start` is run without `cap niet:setup` being run first
+
+## 0.4.0 - 2012-11-19
+
+Enhancements:
+
+* include capistrano_colors by default
+* apache:configure task now copies a folder stage/apache/* if present falling back to previous state/apache.conf
+* added `easy/deployment/performance` optional require to track the times of deployments
+
+## 0.3.3 - 2012-10-16
+
+Bug Fixes
+
+* `deploy:reference` should use the rails_env, not the stage
+
+## 0.3.0 - 2012-09-04
+
+Enhancements:
+
+* Add `apache:configure_and_reload` capistrano task, which will configure the site, test the configuration & gracefully reload the Apache configuration
+
+## 0.2.2 - 2012-08-27
+
+Enhancements:
+
+* Add `apache:configtest` capistrano task
+
+Bug Fixes:
+
+* Spelling corrections

data/README.md

@@ -1,5 +1,9 @@
 # Easy::Deployment
 
+[![Gem Version](https://badge.fury.io/rb/easy-deployment.png)](http://badge.fury.io/rb/easy-deployment)
+[![Dependency Status](https://gemnasium.com/AbleTech/easy-deployment.png)](https://gemnasium.com/AbleTech/easy-deployment)
+[![Code Climate](https://codeclimate.com/github/AbleTech/easy-deployment.png)](https://codeclimate.com/github/AbleTech/easy-deployment)
+
 This gem is for encapsulating Abletech's common deployment patterns using capistrano.
 
 ## Installation
@@ -22,6 +26,9 @@ Run:
 
     $ rails g easy:deployment
 
+The templated configuration files leave several lines blank for you to fill in with TODO placeholders, so it's a good idea to run `rake notes:todo` after installation to see if you've missed any.
+Replace any missing configuration lines, and don't forget to remove the TODO text/comments
+
 ## Integration
 
 ### Apache
@@ -41,7 +48,11 @@ If necessary, you can set the path to the apache2ctl binary via:
 
     set :apachectl_bin, "/usr/sbin/apachectl"
 
-This assumes your deploy user has access to run the apachectl command with sudo privileges
+This assumes your deploy user has access to run the apachectl command with sudo privileges. As a recommended security practice, your deploy user should not have general sudo access, instead configure limited sudo access for specific commands only, declaring the full binary path
+
+    # Example sudoers file entries to grant deploy user passwordless sudo privileges to only these commands
+    deploy ALL=(ALL) NOPASSWD:/usr/sbin/apachectl graceful
+    deploy ALL=(ALL) NOPASSWD:/usr/sbin/apachectl configtest
 
 ### Logrotate
 
@@ -52,6 +63,20 @@ If you have logrotate installed and /etc/logrotate.d is writable by your deploy
 
 within your deploy.rb to have a logrotate config automatically written
 
+### Backup
+
+This includes a generator to create a backup configuration (generator may be disabled when running easy:deployment by passing `--disable-backup`, or run by itself as `rails generate easy:backup`)
+
+This will generate:
+
+    config/backup.rb
+    config/schedule.rb
+    config/s3.yml
+
+The created backup configuration will be scheduled on deploy to run nightly via the whenever integration below, and with a backup configuration at `config/backup.rb`
+The default setup is to backup the capistrano system folder, the configured database, to store the backup in S3, and notify of failures via email.
+All these settings are configurable, to read more see the documentation for the backup gem https://github.com/meskyanichi/backup and setup your configuration to suit yourself.
+
 ### Whenever
 
 If you use the whenever gem to manage application crontabs, automatically include the capistrano

data/easy-deployment.gemspec

@@ -16,9 +16,7 @@ Gem::Specification.new do |gem|
   gem.version       = Easy::Deployment::VERSION
 
   gem.add_runtime_dependency 'rails', '>= 3.0.0'
-  gem.add_runtime_dependency 'capistrano'
-  gem.add_runtime_dependency 'capistrano-ext'
-  gem.add_runtime_dependency 'capistrano_colors'
+  gem.add_runtime_dependency 'capistrano', '~> 2.13.5'
 
   gem.add_development_dependency 'bundler'
   gem.add_development_dependency 'rspec', '~> 2.0'

data/lib/easy-deployment.rb

@@ -1,3 +1,5 @@
 require "easy-deployment/version"
+require "easy/generators/generator_helpers"
 require 'easy/generators/deployment_generator'
 require 'easy/generators/stage_generator'
+require 'easy/generators/backup_generator'

data/lib/easy-deployment/version.rb

@@ -1,5 +1,5 @@
 module Easy
   module Deployment
-    VERSION = "0.4.4"
+    VERSION = "0.5.0"
   end
 end

data/lib/easy/deployment/backup.rb

@@ -6,14 +6,8 @@ Capistrano::Configuration.instance(:must_exist).load do
       task :setup, :except => { :no_release => true } do
         run "mkdir -p #{shared_path}/backup/data"
       end
-
-      desc "Adds a symbolic link from the s3.yml file in the shared/backup into the current/config folder"
-      task :symlink_s3_config do
-        run "ln -sf #{shared_path}/backup/s3.yml #{current_path}/config/s3.yml"
-      end
     end
   end
 
   after 'deploy:setup', 'easy:backup:setup'
-  after 'deploy:symlink', 'easy:backup:symlink_s3_config'
 end

data/lib/easy/deployment/capistrano.rb

@@ -2,7 +2,6 @@
 # To load this capistrano configuraiton, require 'easy/deployment/capistrano' from deploy.rb
 
 Capistrano::Configuration.instance(:must_exist).load do
-  require 'capistrano_colors'
 
   # color the string
   def red(str)
@@ -72,4 +71,14 @@ Capistrano::Configuration.instance(:must_exist).load do
     system "git push origin #{branch}:releases/#{stage}"
   end
 
+  desc "Annotate release into version.txt"
+  task :annotate_release do
+    git_revision = `git rev-parse #{branch} 2> /dev/null`.strip
+    version_info = "Branch/Tag: #{branch}\\nRevision: #{git_revision}\\nDeployed To: #{stage}\\n\\nDeployed At: #{Time.now}\\nBy: #{`whoami`.chomp}\\n"
+    run %Q(printf "#{version_info}" > #{release_path}/version.txt)
+  end
+
+  after "deploy:update", "tag_release"
+  after "deploy:update", "annotate_release"
+
 end

data/lib/easy/deployment/whenever.rb

@@ -17,6 +17,6 @@ Capistrano::Configuration.instance(:must_exist).load do
   end
 
   after "deploy:update_code", "easy:whenever:clear_crontab"
-  after "deploy:symlink", "easy:whenever:update_crontab"
+  after "deploy:create_symlink", "easy:whenever:update_crontab"
   after "deploy:rollback", "easy:whenever:update_crontab"
 end

data/lib/easy/generators/backup_generator.rb

@@ -0,0 +1,46 @@
+require 'rails/generators'
+
+module Easy
+  class BackupGenerator < Rails::Generators::Base
+    source_root File.join(File.dirname(__FILE__), "templates") # Where templates are copied from
+
+    include GeneratorHelpers
+
+    desc %{Generates a backup config set to run nightly and upload to S3}
+
+    def create_backup_files
+      gem_group(:backup) do
+        gem "whenever", :require => false
+        case Rails::VERSION::MAJOR
+        when 3
+          gem "backup", "~> 3.0.27", :require => false
+          gem "fog",    "~> 1.4.0",  :require => false
+          gem "mail",   "~> 2.4.0",  :require => false
+        when 4
+          gem "backup", "~> 3.1.3",   :require => false
+          gem "fog",     "~> 1.9.0",  :require => false
+          gem "net-ssh", "<= 2.5.2",  :require => false # Greater than >= 2.3.0 as well, though we can't express that
+          gem "net-scp", "<= 1.0.4",  :require => false # Greater than 1.0.0
+          gem "excon",   "~> 0.17.0", :require => false
+          gem "mail",    "~> 2.5.0",  :require => false
+        else
+          warn "Unsupported rails release detected. You'll need to manage your own dependencies for the backup gem"
+          gem "backup", :require => false
+        end
+      end
+
+      template("backup.rb.tt", "config/backup.rb")
+      template("schedule.rb.tt", "config/schedule.rb")
+      copy_file("s3.yml", "config/s3.yml")
+
+      run("bundle install")
+
+      say("Backup configuration generated", :green)
+      say("  - TODO: edit config/backup.rb setting notification addresses and other configuration options", :green)
+      say("  - TODO: ensure your S3 keys are set in config/s3.yml", :green)
+
+      true
+    end
+
+  end
+end

data/lib/easy/generators/deployment_generator.rb

@@ -1,56 +1,61 @@
 require 'rails/generators'
-require 'optparse'
 
 module Easy
   class DeploymentGenerator < Rails::Generators::Base
     source_root File.join(File.dirname(__FILE__), "templates") # Where templates are copied from
 
-    def application_name
-      Rails.application.class.name.split("::").first.underscore # surely there's a better way than this
-    end
+    include GeneratorHelpers
+
+    INSTALL_MSG = %{
+Easy Deployment Config now setup!
+
+TODO:
+  * Set the correct git repository in config/deploy.rb
+  * Edit Capfile and enable asset pipeline compilation if you are using it (uncomment load 'deploy/assets')
+}
 
     desc %{Generates standard able technology deployment script using capistrano}
 
-    def create_deployment_files
-      options = parse_options(ARGV)
+    class_option :stages,           :type => :array,   :default => ['staging', 'production'], :aliases => :s
+    class_option :disable_backup,   :type => :boolean, :default => false
+    class_option :disable_bugsnag,  :type => :boolean, :default => false
+    class_option :disable_newrelic, :type => :boolean, :default => false
 
-      # If there was a deploy.rb initially, let the generator prompt to handle conflicts. Otherwise remove the default capistrano one, so we can override it silently with our template without being prompted
-      deploy_file_already_existed = File.exist?(File.join(destination_root, "config", "deploy.rb"))
+    def create_deployment_files
+      template("deploy.rb.tt", "config/deploy.rb") # Generate deploy.rb first to use ours not capistrano's deploy.rb
       capify!
-      remove_file("config/deploy.rb") unless deploy_file_already_existed # Removing this means we aren't prompted to overwrite if we only have the default capistrano deploy.rb
-      # Write our default deploy.rb
-      copy_file("deploy.rb.tt", "config/deploy.rb")
 
       # Generate all stages specified
-      options[:stages] ||= %w(staging production)
       options[:stages].each do |stage|
         generate("easy:stage", stage)
       end
 
-      info = %{
-Easy Deployment Config now setup!
-
-TODO:
-  * Set the correct git repository in config/deploy.rb
-}
+      say(INSTALL_MSG, :green)
       options[:stages].each do |stage|
-        info += "  * Set the ip address for staging in config/deploy/#{stage}.rb && the apache config in config/deploy/#{stage}/apache/#{application_name}"
+        say("  * Set the ip address for staging in config/deploy/#{stage}.rb && the apache config in config/deploy/#{stage}/apache.conf", :green)
       end
-      puts info
-      true
-    end
 
-    private
-
-    # TODO: surely there's a better option parser built into thor, or the generators themselves?
-    def parse_options(args)
-      opts = {}
-      OptionParser.new do |opt|
-        opt.on("-s", "--stages" "Stages to generate") do |s|
-          opts[:stages] = s.split(",") if s.present?
-        end
-      end.parse(args)
-      opts
+      needs_bundle = false
+
+      unless options[:disable_newrelic]
+        say_status(:configure, "New Relic gem")
+        gem("newrelic_rpm", ">= 3.5.3.25")
+        needs_bundle = true
+      end
+      unless options[:disable_bugsnag]
+        say_status(:configure, "bugsnag")
+        gem("bugsnag")
+        needs_bundle = true
+      end
+
+      unless options[:disable_backup]
+        generate("easy:backup")
+        needs_bundle = false # because easy:backup runs bundle install
+      end
+
+      bundle_command(:install) if needs_bundle
+
+      true
     end
 
   end

data/lib/easy/generators/generator_helpers.rb

@@ -0,0 +1,15 @@
+module GeneratorHelpers
+
+  def application_name
+    Rails.application.class.name.split("::").first.underscore # surely there's a better way than this
+  end
+
+  private
+
+  def bundle_command(command)
+    # say_status :run, "bundle #{command}"
+    # print `"#{Gem.ruby}" -rubygems "#{Gem.bin_path('bundler', 'bundle')}" #{command}`
+    run("bundle #{command}")
+  end
+
+end

data/lib/easy/generators/stage_generator.rb

@@ -8,13 +8,14 @@ module Easy
 
     def generate_stage
       directory("stage", "config/deploy/#{name}")
-      copy_file("stage.rb.tt", "config/deploy/#{name}.rb")
+      template("stage.rb.tt", "config/deploy/#{name}.rb")
+      template("stage/apache.conf.tt", "config/deploy/#{name}/apache.conf")
 
       # Ensure we have a config/environments/<env-name>.rb
       dest = "config/environments/#{name}.rb"
       in_root do
         unless File.exist?(dest)
-          run("cp config/environments/production.rb #{dest}")
+          run("cp config/environments/staging.rb #{dest}")
         end
       end
     end

data/lib/easy/generators/templates/backup.rb.tt

@@ -0,0 +1,58 @@
+Backup::Model.new("<%= application_name %>", "Remote Backup") do
+
+  # This is the rails root location, given this file is located at in Rails.root/config/backup.rb
+  rails_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+
+  <%
+    database_engine = "'TODO: FILL IN'"
+    database_config_filename = "database.yml"
+    if defined?(PG)
+      database_engine = 'PostgreSQL'
+    elsif defined?(Mongo)
+      database_engine = 'MongoDB'
+      database_config_filename = "mongo.yml"
+    end
+  %>
+  database_config = YAML.load_file(File.join(rails_root, "config/<%= database_config_filename %>"))
+
+  database <%= database_engine %> do |db|
+    db.name               = database_config["database"]
+    db.host               = database_config["host"] if database_config["host"]
+    db.port               = database_config["port"] if database_config["port"]
+    db.username           = database_config["username"] if database_config["username"]
+    db.password           = database_config["password"] if database_config["password"]
+    db.additional_options = []
+  end
+
+  archive :system_folder_backup do |archive|
+    # add folders (including sub-folders)
+    folder = File.expand_path("#{rails_root}/../shared/system/")
+    archive.add(folder)
+  end
+
+
+  s3config = YAML.load_file(File.join(rails_root, "config/s3.yml"))
+
+  store_with S3 do |s3|
+    s3.access_key_id      = s3config['access_key_id']
+    s3.secret_access_key  = s3config['secret_access_key']
+    s3.region             = s3config['region']
+    s3.bucket             = s3config['backup_bucket']
+    s3.path               = "/<%= application_name %>/#{ENV['RAILS_ENV']}/"
+    # s3.keep               = 30 # Enable this if you have read/delete access on S3 to clean up old backups
+  end
+
+  compress_with Bzip2 do |compression|
+    compression.level = 9
+  end
+
+  notify_by Mail do |mail|
+    mail.on_success           = false
+    mail.on_warning           = true
+    mail.on_failure           = true
+
+    mail.delivery_method      = :sendmail
+    mail.from                 = 'TODO: set from address'
+    mail.to                   = 'TODO: set delivery address'
+  end
+end

data/lib/easy/generators/templates/deploy.rb.tt

@@ -1,24 +1,52 @@
-require "capistrano/ext/multistage"
-require "capistrano_colors"
-require "bundler/capistrano"
 begin
+  require "capistrano/ext/multistage"
+  require "bundler/capistrano"
   require "easy/deployment/capistrano"
-rescue LoadError
-  $stderr.puts "couldn't load easy-deployment gem, try `bundle install` and running again with `bundle exec cap <stage> deploy`"
+rescue LoadError => e
+  $stderr.puts "couldn't load deployment gems, try `bundle install` and running again with `bundle exec cap <stage> deploy`"
+  $stderr.puts e.message
   exit(1)
 end
 
+# Deployment tools
+<% unless options[:disable_bugsnag] %>require "bugsnag/capistrano"<% end %>
+<% unless options[:disable_newrelic] %>require "new_relic/recipes"
+after "deploy:update", "newrelic:notice_deployment"
+<% end %><% unless options[:disable_backup] %># Backup
+require "easy/deployment/backup"
+require "whenever/capistrano"
+set :whenever_command, "#{fetch(:bundle_cmd, "bundle")} exec whenever"
+<% end %>
+
 set :stages, %w(staging production)
 set :default_stage, "staging"
 
-set :application, "<%= application_name %>" # TODO: edit application name
+set :application, "<%= application_name %>"
 set :deploy_to,   "/var/apps/#{application}"
 
-# TODO: fill in git repo
-# set :repository,  "git@github.com:AbleTech/easy-deployment.git"
+# set :repository,  "git@github.com:AbleTech/easy-deployment.git" # TODO: fill in git repo
 set :scm, :git
 set :deploy_via, :remote_cache
 set :git_shallow_clone, 1
+# easy-deployment sets the branch to deploy to the current local branch by default.
+
+set :bundle_without, defer { fetch(:stages) - [fetch(:stage)] } # Bundle without other stage environments
+
+set :user, "deploy"
+set :runner, "deploy"
+
+# Optional feature: apache restarts
+# require "easy/deployment/apache"
+# set :apachectl_bin, "/usr/sbin/apachectl"
+
+# Optional feature: configure log rotation
+# require "easy/deployment/logrotate"
+
+# Optional feature: db reference data. Requires easy-reference gem
+# require "easy/deployment/dbreference"
+
+# Optional feature: capistrano performance report. Timings for slow deploys
+# require "easy/deployment/performance"
 
 
 # If deploying with RVM:

data/lib/easy/generators/templates/s3.yml

@@ -0,0 +1,5 @@
+---
+access_key_id    : "TODO: fill in your access key"
+secret_access_key: "TODO: fill in your secret here"
+backup_bucket    : "TODO: fill in your backup bucket"
+region           : "us-east-1"

data/lib/easy/generators/templates/schedule.rb.tt

@@ -0,0 +1,36 @@
+# Use this file to easily define all of your cron jobs.
+#
+# It's helpful, but not entirely necessary to understand cron before proceeding.
+# http://en.wikipedia.org/wiki/Cron
+
+# Example:
+#
+# set :output, "/path/to/my/cron_log.log"
+#
+# every 2.hours do
+#   command "/usr/bin/some_great_command"
+#   runner "MyModel.some_method"
+#   rake "some:great:rake:task"
+# end
+#
+# every 4.days do
+#   runner "AnotherModel.prune_old_records"
+# end
+
+# Learn more: http://github.com/javan/whenever
+
+set :output, "log/cron.log"
+
+
+set :application, "<%= application_name %>"
+set :base_path, "/var/apps/#{application}"
+set :current_path, "#{base_path}/current"
+set :shared_path, "#{base_path}/shared"
+
+set :output, "#{shared_path}/log/cron.log"
+set :bundle_cmd, "bundle"
+
+# Note: doublecheck timezone of your destination server
+every 1.day, :at => '3:00 am' do
+  command "cd #{current_path} && RAILS_ENV=#{environment} #{bundle_cmd} exec backup perform --trigger #{application} --config-file #{current_path}/config/backup.rb --data-path #{shared_path}/backup/data"
+end

data/lib/easy/generators/templates/stage.rb.tt

@@ -1,6 +1,4 @@
-# role :web, "<<%= name %>-ip-address>"                   # Your HTTP server, Apache/etc
-# role :app, "<<%= name %>-ip-address>"                   # This may be the same as your `Web` server
-# role :db,  "<<%= name %>-ip-address>", :primary => true # This is where Rails migrations will run
+server '<<%= name %>-ip-address>', :web, :app, :db, :primary => true
+# :db, :primary => true is where migrations will run.
 
-set :branch, "master"
 set :rails_env, "<%= name %>"

data/lib/easy/generators/templates/stage/{apache/%application_name%.tt → apache.conf.tt}

@@ -1,4 +1,4 @@
-<VirtualHost <<%= name %>-ip-address>:80>
+<VirtualHost *:80>
    ServerName <%= name %>.<%= application_name %>.co.nz
 
    DocumentRoot /var/apps/<%= application_name %>/current/public

data/lib/easy/generators/templates/stage/logrotate.conf.tt

@@ -0,0 +1,8 @@
+/var/apps/<%= application_name %>/shared/log/*.log {
+  daily
+  missingok
+  rotate 7
+  compress
+  delaycompress
+  copytruncate
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy-deployment
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-11 00:00:00.000000000 Z
+date: 2013-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -35,49 +35,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: capistrano-ext
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: capistrano_colors
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.13.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.13.5
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -122,7 +90,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
-- ChangeLog
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -139,12 +107,17 @@ files:
 - lib/easy/deployment/niet.rb
 - lib/easy/deployment/performance.rb
 - lib/easy/deployment/whenever.rb
+- lib/easy/generators/backup_generator.rb
 - lib/easy/generators/deployment_generator.rb
-- lib/easy/generators/logrotate_generator.rb
+- lib/easy/generators/generator_helpers.rb
 - lib/easy/generators/stage_generator.rb
+- lib/easy/generators/templates/backup.rb.tt
 - lib/easy/generators/templates/deploy.rb.tt
+- lib/easy/generators/templates/s3.yml
+- lib/easy/generators/templates/schedule.rb.tt
 - lib/easy/generators/templates/stage.rb.tt
-- lib/easy/generators/templates/stage/apache/%application_name%.tt
+- lib/easy/generators/templates/stage/apache.conf.tt
+- lib/easy/generators/templates/stage/logrotate.conf.tt
 - spec/easy_deployment_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/AbleTech/easy-deployment
@@ -159,21 +132,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2565784837031824026
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2565784837031824026
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Gem for encapsulating Abletech's deployment practices

data/ChangeLog

@@ -1,25 +0,0 @@
-0.3.3 - 2012-10-16
-
-  Bug Fixes
-
-    * deploy:reference should use the rails_env, not the stage
-
-0.3.0 - 2012-09-04
-
-  Enhancements:
-
-    * Add apache:configure_and_reload capistrano task, which will configure the site, test the configuration & gracefully reload the Apache configuration
-
-        cap apache:configure_and_reload
-
-0.2.2 - 2012-08-27
-
-  Enhancements:
-
-    * Add apache:configtest capistrano task
-
-        cap apache:configtest
-
-  Bug Fixes:
-
-    * Spelling corrections

data/lib/easy/generators/logrotate_generator.rb

@@ -1,21 +0,0 @@
-require 'rails/generators'
-
-module Easy
-  class LogrotateGenerator < Rails::Generators::NamedBase
-    source_root File.join(File.dirname(__FILE__), "templates") # Where templates are copied from
-
-    desc %{Generate a new logrotate.conf file for the given environment name\ne.g. rails g easy:logrotate workshop}
-
-    def generate_stage
-      # directory("stage", "config/#{name}")
-
-      # Ensure we have a config/deploy/<env-name>/logrotate.rb
-      # dest = "config/deploy/#{name}/logrotate.conf"
-      # in_root do
-      #   unless File.exist?(dest)
-      #     run("cp config/environments/production.rb #{dest}")
-      #   end
-      # end
-    end
-  end
-end