deployable 0.0.5 → 0.0.6

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.0.6 (February 1st, 2012)
+
+* Updated initrd script for passenger to nog log
+* Added custom ERB template handler so it works in ruby 1.9.x and 1.8.x
+
+## 0.0.5 (January 25th, 2012)
+
+* Don't depend on highline, let the environment decide
+
 ## 0.0.4 (January 25th, 2012)
 
 * Don't fail if a certain config isn't set, just ignore it.

data/examples/scripts/initd.rb

@@ -138,8 +138,19 @@ class Application
     # Run the before start callback
     run_callback(:start, :before)
     
+    # Make sure we have the required dirs
+    execute "mkdir -p #{self.path + "shared/pid"}"
+    execute "mkdir -p #{self.path + "shared/log"}"    
+    
     # Start the server
-    puts rvm_execute(self.config, "passenger start #{self.path + "current"} --user #{USER} --port #{self.config['passenger']['port']} --environment production -d --pid-file #{self.path + "passenger.pid"}")
+    options = []
+    options << "--user #{USER}"
+    options << "--port #{self.config['passenger']['port']}"
+    options << "--environment production"
+    options << "--daemonize"
+    options << "--pid-file #{self.path + "shared/pid/passenger.pid"}"
+    options << "--log-file /dev/null"
+    puts rvm_execute(self.config, "passenger start #{self.path + "current"} #{options.join(" ")}")
     
     # Run the after start callback
     run_callback(:start, :after)    

data/lib/deployable/database.rb

@@ -64,7 +64,8 @@
 # within the file.
 # For instance, the template above takes advantage of Capistrano CLI
 # to ask for a MySQL database password instead of hard coding it into the template.
-require 'ostruct'
+
+require "deployable/helpers/erb_template"
 
 Capistrano::Configuration.instance.load do
   namespace :database do
@@ -105,9 +106,7 @@ EOF
       location = fetch(:template_dir, "config/deploy/templates") + '/database.yml.erb'
       template = File.file?(location) ? File.read(location) : default_template
 
-
-      view = ERB.new(template)
-      put view.result(OpenStruct.new(:config => fetch(:database_config)).send(:binding)), "#{deploy_to}/database.yml"
+      put Deployable::ErbTemplate.new(template).render(fetch(:database_config, {})), "#{deploy_to}/database.yml"
     end
 
     desc <<-DESC

data/lib/deployable/helpers/erb_template.rb

@@ -0,0 +1,15 @@
+require 'erb'
+require 'ostruct'
+
+module Deployable
+  class ErbTemplate
+    def initialize(template)
+      @template = ERB.new(template)
+    end
+  
+    def render(variables)
+      context = OpenStruct.new(:config => variables).instance_eval{ binding }
+      @template.result(context)
+    end
+  end
+end

data/lib/deployable/version.rb

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

metadata

@@ -1,66 +1,48 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: deployable
-version: !ruby/object:Gem::Version 
-  hash: 21
+version: !ruby/object:Gem::Version
+  version: 0.0.6
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 5
-  version: 0.0.5
 platform: ruby
-authors: 
+authors:
 - Digitpaint
 - Flurin Egger
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-25 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-01 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: capistrano
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70307105225940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 2
-        - 9
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.9.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: capistrano-ext
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70307105225940
+- !ruby/object:Gem::Dependency
+  name: capistrano-ext
+  requirement: &70307105225440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 1
-        - 2
-        - 1
+      - !ruby/object:Gem::Version
         version: 1.2.1
   type: :runtime
-  version_requirements: *id002
-description: This library contains commonly used capistrano tasks, a couple of default recipes and example configurations.
-email: 
+  prerelease: false
+  version_requirements: *70307105225440
+description: This library contains commonly used capistrano tasks, a couple of default
+  recipes and example configurations.
+email:
 - info@digitpaint.nl
 - flurin@digitpaint.nl
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .yardopts
 - CHANGELOG.md
@@ -77,6 +59,7 @@ files:
 - lib/deployable/config_files.rb
 - lib/deployable/database.rb
 - lib/deployable/directories.rb
+- lib/deployable/helpers/erb_template.rb
 - lib/deployable/passenger.rb
 - lib/deployable/passenger_standalone.rb
 - lib/deployable/recipes/default_with_database.rb
@@ -84,36 +67,26 @@ files:
 - lib/deployable/version.rb
 homepage: https://github.com/DigitPaint/Deployable
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: deployable
-rubygems_version: 1.8.15
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: A collection of handy capistrano tasks and recipes
 test_files: []
-