capistrano-buildpack 0.0.4 → 0.0.5

data/lib/capistrano-buildpack/tasks.rb

@@ -3,48 +3,80 @@ require 'digest/sha1'
 if Capistrano::Configuration.instance
   Capistrano::Configuration.instance.load do
 
-    set :deploy_to, "/apps/#{application}"
+    def read_env(name)
+      env = {}
+      filename = ".env.#{name}"
+      return env unless File.exists?(filename)
 
-    after "deploy:setup" do
-      sudo "chown -R #{user} #{deploy_to}"
-      sudo "gem install foreman-export-nginx --update"
+      File.open(".env.#{name}") do |f|
+        f.each do |line|
+          key, val = line.split('=', 2)
+          env[key] = val
+        end
+      end
+
+      set :deploy_env, env
     end
 
-    before "deploy" do
-      default_run_options[:pty] = true
-      default_run_options[:shell] = '/bin/bash'
+    namespace :buildpack do
+      task :setup do
+        set :deploy_to, "/apps/#{application}"
 
-      set :foreman_export_path, "/etc/init"
-      set :foreman_export_type, "upstart"
-      set :nginx_export_path, "/etc/nginx/conf.d"
+        default_run_options[:pty] = true
+        default_run_options[:shell] = '/bin/bash'
 
-      set :buildpack_hash, Digest::SHA1.hexdigest(buildpack_url)
-      set :buildpack_path, "#{shared_path}/buildpack-#{buildpack_hash}"
+        set :foreman_export_path, "/etc/init"
+        set :foreman_export_type, "upstart"
+        set :nginx_export_path, "/etc/nginx/conf.d"
 
-      run("[[ ! -e #{buildpack_path} ]] && git clone #{buildpack_url} #{buildpack_path}; exit 0")
-      run("cd #{buildpack_path} && git fetch origin && git reset --hard origin/master")
-      run("mkdir -p #{shared_path}/build_cache")
-    end
+        set :buildpack_hash, Digest::SHA1.hexdigest(buildpack_url)
+        set :buildpack_path, "#{shared_path}/buildpack-#{buildpack_hash}"
 
-    before "deploy:finalize_update" do
-      run("cd #{buildpack_path} && RACK_ENV=production bin/compile #{release_path} #{shared_path}/build_cache")
+        sudo "mkdir -p #{deploy_to}"
+        sudo "chown -R #{user} #{deploy_to}"
+
+        run("[[ ! -e #{buildpack_path} ]] && git clone #{buildpack_url} #{buildpack_path}; exit 0")
+        run("cd #{buildpack_path} && git fetch origin && git reset --hard origin/master")
+        run("mkdir -p #{shared_path}/build_cache")
 
-      env_lines = []
-      deploy_env.each do |k,v|
-        env_lines << "#{k}=#{v}"
       end
-      env_contents = env_lines.join("\n") + "\n"
 
-      put(env_contents, "#{release_path}/.env")
-    end
+      task "install_foreman_export_nginx" do
 
-    namespace :deploy do
-      task :restart do
+        sudo "gem install foreman-export-nginx --update"
+      end
+
+      task "compile" do
+        run("cd #{buildpack_path} && RACK_ENV=production bin/compile #{release_path} #{shared_path}/build_cache")
+
+        env_lines = []
+        deploy_env.each do |k,v|
+          env_lines << "#{k}=#{v}"
+        end
+        env_contents = env_lines.join("\n") + "\n"
+
+        put(env_contents, "#{release_path}/.env")
+      end
+
+      task "foreman_export" do
         sudo "foreman export #{foreman_export_type} #{foreman_export_path} -d #{release_path} -l /var/log/#{application} -a #{application} -u #{user} -p #{base_port} -c #{concurrency}"
         sudo "env ADDITIONAL_DOMAINS=#{additional_domains.join(',')} BASE_DOMAIN=$CAPISTRANO:HOST$ nginx-foreman export nginx #{nginx_export_path} -d #{release_path} -l /var/log/apps -a #{application} -u #{user} -p #{base_port} -c #{concurrency}"
         sudo "service #{application} restart || service #{application} start"
         sudo "service nginx reload || service nginx start"
       end
+
+    end
+
+
+    before "deploy:setup", "buildpack:setup"
+    after  "deploy:setup", "buildpack:install_foreman_export_nginx"
+    before "deploy", "buildpack:setup"
+    before "deploy:finalize_update", "buildpack:compile"
+
+    namespace :deploy do
+      task :restart do
+        buildpack.foreman_export
+      end
     end
 
   end

data/lib/capistrano-buildpack/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Buildpack
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-buildpack
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-01 00:00:00.000000000 Z
+date: 2013-01-02 00:00:00.000000000 Z
 dependencies: []
 description: Deploy 12-factor applications using Capistrano
 email: