deployable 0.0.6 → 0.0.7

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.0.7 (April 4th, 2012)
+
+* Added recipe without database support
+* Add version number and date to the init.trd scripts file
+* Don't let the init.rd script crash on multi-app operations if one of them fails
+* Fix the location of the passenger pid in init.rd
+
 ## 0.0.6 (February 1st, 2012)
 
 * Updated initrd script for passenger to nog log

data/README.md

@@ -17,7 +17,7 @@ Usage
 1. Add the `deployable` gem to your gemfile:
 
         group :development do
-          gem "deployable"
+          gem "deployable", :require => false
         end
 
 2. Config your deploy script (see the `examples/config` directory for some inspiration)

data/examples/config/deploy.rb

@@ -19,6 +19,10 @@ set :git_enable_submodules, 1
 set :user, "admin"
 set :use_sudo, false
 
+set :config_files, {
+  "local.rb" => defer{ "#{current_release}/config/local.rb" }
+}
+
 # ======================================
 
 require 'deployable/recipes/default_with_database'

data/examples/scripts/initd.rb

@@ -2,8 +2,11 @@
 
 # chkconfig: - 85 15
 # description:  Passenger Standalone
-require 'yaml'
-require 'pathname'
+
+# ======================================================
+# Version: 0.0.7
+# Date: 2012-02-05
+# ======================================================
 
 # The user the applications run as.
 USER = "admin"
@@ -37,6 +40,9 @@ APPLICATIONS_PATH = USER_HOME_PATH + "/applications/"
 # Shouldn't be necessary to change stuff below this line
 # ======================================================
 
+require 'yaml'
+require 'pathname'
+
 # Main start routine.
 def run!
   command = ARGV.first
@@ -65,13 +71,21 @@ def run!
       Application.new(application,stage).run!(command)
     else
       applications[application].each do |stage|
-        Application.new(application,stage).run!(command)
+        begin
+          Application.new(application,stage).run!(command)
+        rescue StandardError => e
+          puts "ERROR: #{e.message}"
+        end
       end
     end
   else
     applications.sort.each do |application, stages|
       stages.each do |stage|
-        Application.new(application,stage).run!(command)
+        begin
+          Application.new(application,stage).run!(command)
+        rescue StandardError => e
+          puts "ERROR: #{e.message}"
+        end
       end
     end
   end
@@ -162,7 +176,7 @@ class Application
     # Run the before :stop callback
     run_callback(:stop, :before)
     
-    puts rvm_execute(self.config, "passenger stop --pid-file #{self.path + "passenger.pid"}")
+    puts rvm_execute(self.config, "passenger stop --pid-file #{self.path + "shared/pid/passenger.pid"}")
     
     # Run the after :stop callback
     run_callback(:stop, :after)    

data/lib/deployable/recipes/default_without_database.rb

@@ -0,0 +1,44 @@
+# This is our default deployment script without database support and assumes the following
+#
+# - Capistrano Multistage
+# - RVM
+# - Passenger
+# - Passenger Standalone
+# - Bundler
+
+Capistrano::Configuration.instance(true).load do
+  # Load multistage
+  require 'capistrano/ext/multistage'
+
+  # Load RVM
+  require 'rvm/capistrano'
+
+  # Overwrite the start/stop/restart tasks
+  require 'deployable/passenger'
+
+  # Add RVM specific tools
+  require "deployable/rvm"
+  before "deploy:setup", "rvm:create_gemset"
+  after "deploy:finalize_update", "rvm:set_rvmrc", "rvm:trust_rvmrc"
+
+  # Enable bundling
+  require 'bundler/capistrano'
+  require "deployable/bundle"
+  after "rvm:trust_rvmrc", "bundle:config"
+
+  # Passenger standalone setup
+  require "deployable/passenger_standalone"
+  after "deploy:setup", "passenger_standalone:setup"
+
+  # Config files support
+  require "deployable/config_files"
+  after "deploy:setup", "config_files:setup"
+  after "deploy:update_code", "config_files:install"
+  
+  # Directories support
+  require 'deployable/directories'
+  after "deploy:update_code", "directories:create"
+
+  # Cleanup
+  after "deploy", "deploy:cleanup"
+end

data/lib/deployable/version.rb

@@ -1,3 +1,3 @@
 module Deployable
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deployable
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-01 00:00:00.000000000Z
+date: 2012-05-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &70307105225940 !ruby/object:Gem::Requirement
+  requirement: &70267159523680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 2.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *70307105225940
+  version_requirements: *70267159523680
 - !ruby/object:Gem::Dependency
   name: capistrano-ext
-  requirement: &70307105225440 !ruby/object:Gem::Requirement
+  requirement: &70267159510180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,7 +33,7 @@ dependencies:
         version: 1.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70307105225440
+  version_requirements: *70267159510180
 description: This library contains commonly used capistrano tasks, a couple of default
   recipes and example configurations.
 email:
@@ -63,6 +63,7 @@ files:
 - lib/deployable/passenger.rb
 - lib/deployable/passenger_standalone.rb
 - lib/deployable/recipes/default_with_database.rb
+- lib/deployable/recipes/default_without_database.rb
 - lib/deployable/rvm.rb
 - lib/deployable/version.rb
 homepage: https://github.com/DigitPaint/Deployable