amoeba_deploy_tools 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38d8d329e3a16a01578208d5d492df39d6076b7c
-  data.tar.gz: 0cce0437a12718405fc4e99f6a0efbe92a131044
+  metadata.gz: 46ec4cdaae2a986f1deb936216e40730eb91b293
+  data.tar.gz: 5e9dc6fbd69427688e20961a27a8c4240b14f8f3
 SHA512:
-  metadata.gz: 6ca785592ec34e83eccdb2f21a96257453be6ebcda12048e27722aa8a8487e4490919c70de9e2b0159653b3b7314ab477e6b22b155dbc168c06965c086b95ea7
-  data.tar.gz: d14a8674f969fe78a6305a0370bf22fe1711c8c097335a714164babad7ff1c9bc4924648dced8149dff766984770948b1288467c3e56ab0feeebdc347467be2e
+  metadata.gz: f9133cddf24e41e3b34bacf49e886d87d48167d6daeabee94dbaa68a037e7c0bc5ff5f23c5406ba079b5a6a9d8814615991db2fd807f239ac03c38cf87e27ae6
+  data.tar.gz: 4a3d5fd6c5bc9586acc57f122887fdd19446dfe373d511335c0ec46db700817226aa063cf0ae08551bedd505cf1fa57c4299680ba377eee0511cc609af2c9e25

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Amoeba Consulting
+Copyright (c) 2014 Amoeba Labs
 
 MIT License
 

data/README.md

@@ -7,7 +7,7 @@ often setting up a chef "kitchen" can be tedious. Additionally, we believe in su
 deploys. That is, we don't like to maintain and run a separate chef server just to manage our boxes.
 
 ADT integrates a number of other tools (`chef-solo`, and `librarian`, and others) and we provide a
-[skeleton Kitchen](http://github.com/AmoebaConsulting/amoeba-kitchen-skel), so you can fork our
+[skeleton Kitchen](http://github.com/AmoebaLabs/amoeba-kitchen-skel), so you can fork our
 kitchen, install this gem, and deploy a node in minutes.
 
 ## Short introduction
@@ -79,5 +79,75 @@ The URL is optional, but if specified will be used as the library's git repo. Yo
 do not already have a Kitchen you wish to use in git, but want to start a new one based on the URL
 specified).
 
-The default URL is [Amoeba's skeleton](https://github.com/AmoebaConsulting/amoeba-kitchen-skel),
+The default URL is [Amoeba's skeleton](https://github.com/AmoebaLabs/amoeba-kitchen-skel),
 which will be copied (as if `--skeleton` was specified).
+
+
+## Capistrano Integration
+
+When building a node using ADT, you are expected to deploy to it using Capistrano. To make things
+easier, we have included some capistrano recipies to assist with your deployment. Note that we
+currently only support Capistrano 2.x, as there were significant changes in 3.x that make it
+incompatible. If you use 3.x, you can still use ADT, but you'll have to symlink the database.yml
+yourself (as well as figure out how to deploy your application initially). We will gladly accept a
+pull request if someone wishes to share it.
+
+For those using Capistrano 2.x, you can do the following to use ADT quickly:
+
+First, `capify` your application, which generates a `Capfile` that basically loads `config/deploy.rb`
+
+Add to your `config/deploy.rb` the following contents:
+
+```ruby
+#### 3rd party recipes
+require "bundler/capistrano"
+require "amoeba_deploy_tools/capistrano"
+
+#### Variables
+set :application,      "Your App Name"
+set :repository,       "[insert git:// url]"
+set :scm,              :git
+
+#### We will use multi-stage to support several enviornments (in case you use more than one). Be
+#### sure to include all envs you will deploy servers for (normally just QA and Production).
+set :stages,           %w(production qa)
+set :default_stage,    "qa"
+
+require "capistrano/ext/multistage"
+
+set :user,             "yourappuser"
+set :deploy_to,        "/home/yourappuser"
+set :deploy_via,       :remote_cache
+
+set :use_sudo,         false
+set :ssh_options,      { forward_agent: true }
+default_run_options[:pty] = true
+
+set :branch, 'master' unless exists?(:branch)
+
+#### Custom recipes
+# Insert any custom recipes
+
+```
+
+### Customized Capistrano Recipes
+
+The line that reads `require "amoeba_deploy_tools/capistrano"` will automagically symlink your
+`database.yml` and allow you to run a `cap amoeba:bootstrap` command, which is used to deploy your
+application for the first time.
+
+#### amoeba:bootstrap
+
+This is used to bootstrap a "cold" server. Run it once after you first bootstrap your server node
+using ADT. It will perform the following functions:
+
+ * update
+ * db_setup
+ * migrate
+ * start
+
+#### deploy:restart
+
+The `cap deploy:restart` command is overridden by ADT so that Passenger's restart method can be used
+(which doesn't require sudo or restarting a process). Instead it just touches tmp/restart.txt in the
+project folder). Feel free to override this behavior if you'd like.

data/{amoeba-deploy-tools.gemspec → amoeba_deploy_tools.gemspec}

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.email         = 'sayhi@amoe.ba'
   s.summary       = 'Easy Chef Solo / Knife operation with Amoeba Deploy Tools.'
   s.description   = 'Easy Chef Solo / Knife operation with Amoeba Deploy Tools.'
-  s.homepage      = 'https://github.com/AmoebaConsulting/amoeba-deploy-tools'
+  s.homepage      = 'https://github.com/AmoebaLabs/amoeba_deploy_tools'
   s.license       = 'MIT'
 
   s.files         = `git ls-files`.split("\n")

data/lib/amoeba_deploy_tools/capistrano.rb

@@ -6,6 +6,6 @@ else
   require 'amoeba_deploy_tools/capistrano/recipes'
 
   Capistrano::Configuration.instance(:must_exist).load do
-    after   'deploy:finalize_update',  'amoeba_deploy_tools:symlink_configs'
+    after   'deploy:finalize_update',  'amoeba:symlink_configs'
   end
 end

data/lib/amoeba_deploy_tools/capistrano/recipes.rb

@@ -1,18 +1,17 @@
 require 'amoeba_deploy_tools/capistrano/common'
+require 'amoeba_deploy_tools/capistrano/sidekiq'
 
 Capistrano::Configuration.instance(:must_exist).load do
   _cset(:database_yml_path){ "#{shared_path}/config/database.yml" }
 
-  namespace :amoeba_deploy_tools do
+  namespace :amoeba do
     desc 'Link the shared/config files into the current/config dir.'
     task :symlink_configs, :roles => :app do
       run [ "cd #{latest_release}",
             "ln -nfs #{database_yml_path} config/"
           ].join(' && ')
     end
-  end
 
-  namespace :deploy do
     desc "create the database (and load seed data)"
     task :db_setup do
       run "cd #{current_path}; bundle exec rake db:setup RAILS_ENV=#{rails_env}"
@@ -25,13 +24,15 @@ Capistrano::Configuration.instance(:must_exist).load do
     pending migrations, and then instead of invoking `deploy:restart', it will \
     invoke `deploy:start' to fire up the application servers.
     DESC
-    task :cold do
-      update
-      db_setup
-      migrate
-      start
+    task :bootstrap do
+      deploy.update
+      amoeba.db_setup
+      deploy.migrate
+      deploy.start
     end
+  end
 
+  namespace :deploy do
     desc "restart the application (trigger passenger restart)"
     task :restart, :roles => :app, :except => { :no_release => true } do
       run "touch #{current_path}/tmp/restart.txt"

data/lib/amoeba_deploy_tools/capistrano/sidekiq.rb

@@ -0,0 +1,32 @@
+# Adds sidekiq tasks to capistrano. But they aren't going to be called by default in your deploy
+# process. If you use capistrano, add the following to your deploy.rb (or something included by it):
+#
+#  after "deploy:stop",    "sidekiq:stop"
+#  after "deploy:start",   "sidekiq:start"
+#  before "deploy:restart", "sidekiq:restart"
+
+Capistrano::Configuration.instance.load do
+  namespace :sidekiq do
+    desc "Start sidekiq"
+    task :start, roles: :web do
+      sidekiq_processes.times do |i|
+        run "#{shared_path}/init/start_sidekiq #{i}"
+      end
+    end
+
+    desc "Stop sidekiq"
+    task :stop, roles: :web do
+      sidekiq_processes.times do |i|
+        run "#{shared_path}/init/stop_sidekiq #{i}"
+      end
+    end
+
+    desc "Restart sidekiq"
+    task :restart, roles: :web do
+      stop
+      start
+    end
+  end
+end
+
+

data/lib/amoeba_deploy_tools/version.rb

@@ -1,3 +1,3 @@
 module AmoebaDeployTools
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amoeba_deploy_tools
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Daniel Jabbour
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-16 00:00:00.000000000 Z
+date: 2014-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,12 +122,13 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- amoeba-deploy-tools.gemspec
+- amoeba_deploy_tools.gemspec
 - bin/amoeba
 - lib/amoeba_deploy_tools.rb
 - lib/amoeba_deploy_tools/capistrano.rb
 - lib/amoeba_deploy_tools/capistrano/common.rb
 - lib/amoeba_deploy_tools/capistrano/recipes.rb
+- lib/amoeba_deploy_tools/capistrano/sidekiq.rb
 - lib/amoeba_deploy_tools/command.rb
 - lib/amoeba_deploy_tools/commands/amoeba.rb
 - lib/amoeba_deploy_tools/commands/app.rb
@@ -148,7 +149,7 @@ files:
 - spec/amoeba_deploy_tools/config_spec.rb
 - spec/amoeba_deploy_tools/helpers_spec.rb
 - spec/spec_helper.rb
-homepage: https://github.com/AmoebaConsulting/amoeba-deploy-tools
+homepage: https://github.com/AmoebaLabs/amoeba_deploy_tools
 licenses:
 - MIT
 metadata: {}