deprec 2.0.7 → 2.0.8

data/CHANGELOG

@@ -1,5 +1,10 @@
 == git
 
+== 2.0.8 (March 17, 2009)
+
+* :config task now renders configs directly to remote server if locally 
+  rendered versions (from :config_gen task) do not exist.
+
 == 2.0.7 (March 17, 2009)
 
 * bugfix

data/lib/deprec/capistrano_extensions.rb

@@ -159,29 +159,22 @@ module Deprec2
   def push_configs(app, files)   
     app = app.to_s
     files.each do |file|
-      # If the file path is relative we will prepend a path to this projects
-      # own config directory for this service.
-      if file[:path][0,1] != '/'
-        full_remote_path = File.join(deploy_to, app, file[:path]) 
-      else
-        full_remote_path = file[:path]
-      end
       full_local_path = File.join('config', app, file[:path])
-      sudo "test -d #{File.dirname(full_remote_path)} || sudo mkdir -p #{File.dirname(full_remote_path)}"
-      #
-      # XXX work this in to check for per-host variants of config files
-      #
-      # if any variants of this file exist for this host (they have -hostname at end)
-      #   servers = find_servers_for_task(current_task)
-      #   servers.each do |server|
-      #     puts server(..., :hosts => server) # XXX find a way to restrict su_put to one host
-      #   end
-      # else
-      #   # just send them the normal way, it's quicker in parallel
+      if File.exists?(full_local_path)
+        # If the file path is relative we will prepend a path to this projects
+        # own config directory for this service.
+        if file[:path][0,1] != '/'
+          full_remote_path = File.join(deploy_to, app, file[:path]) 
+        else
+          full_remote_path = file[:path]
+        end
+        sudo "test -d #{File.dirname(full_remote_path)} || sudo mkdir -p #{File.dirname(full_remote_path)}"
         std.su_put File.read(full_local_path), full_remote_path, '/tmp/', :mode=>file[:mode]
-      # end
-      #
-      sudo "chown #{file[:owner]} #{full_remote_path}"
+        sudo "chown #{file[:owner]} #{full_remote_path}"
+      else
+        # Render directly to remote host.
+        render_template(app, file.merge(:remote => true))
+      end
     end
   end
   

data/lib/deprec/recipes/app/passenger.rb

@@ -52,6 +52,7 @@ Capistrano::Configuration.instance(:must_exist).load do
         end
         
         initial_config_push
+        activate_system
         
       end
       
@@ -61,7 +62,6 @@ Capistrano::Configuration.instance(:must_exist).load do
         SYSTEM_CONFIG_FILES[:passenger].each do |file|
           deprec2.render_template(:passenger, file.merge(:remote => true))
         end
-        activate_system
       end
 
       # Install dependencies for Passenger

data/lib/deprec/recipes/integrity.rb

@@ -70,6 +70,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       task :config, :roles => :ci do
         deprec2.push_configs(:integrity, SYSTEM_CONFIG_FILES[:integrity])
         sudo "chown #{integrity_user} #{integrity_install_dir}/config.ru"
+        activate
       end
       
       # XXX Setup database for testing project

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: deprec
 version: !ruby/object:Gem::Version 
-  version: 2.0.7
+  version: 2.0.8
 platform: ruby
 authors: 
 - Mike Bailey