le1t0-deprec 2.1.6.070 → 2.1.6.071

data/lib/deprec.rb

@@ -53,4 +53,30 @@ Capistrano::Configuration.instance.deprec.namespaces.keys.each do |ns_name|
       end
     end
   end
+  unless ns.respond_to?(:diff_config)
+    Capistrano::Configuration.instance.namespace :deprec do
+      namespace ns_name do
+        task :diff_config_project do
+          return unless defined?(PROJECT_CONFIG_FILES) && PROJECT_CONFIG_FILES[ns_name]
+          
+          PROJECT_CONFIG_FILES[ns_name].each do |config_file|
+            deprec2.compare_files(ns_name, config_file[:template], config_file[:path])
+          end
+        end
+
+        task :diff_config_system do
+          return unless defined?(SYSTEM_CONFIG_FILES) && SYSTEM_CONFIG_FILES[ns_name]
+
+          SYSTEM_CONFIG_FILES[ns_name].each do |config_file|
+            deprec2.compare_files(ns_name, config_file[:template], config_file[:path])
+          end
+        end
+
+        task :diff_config do
+          diff_config_project
+          diff_config_system
+        end
+      end
+    end
+  end
 end

data/lib/deprec/capistrano_extensions.rb

@@ -33,6 +33,21 @@ module Deprec2
   
   DEPREC_TEMPLATES_BASE = File.join(File.dirname(__FILE__), 'templates')
 
+  def compare_files(app, local_file, remote_file)
+    stage = exists?(:stage) ? fetch(:stage).to_s : ''
+
+    run "cat #{remote_file}" do |channel, stream, data|
+      local_file_full_path = local_file[0,1] == "/" ? local_file : 
+        (File.exists?(File.join('config', stage, channel.properties[:host], app.to_s, local_file)) ? File.join('config', stage, channel.properties[:host], app.to_s, local_file) : File.join('config', stage, app.to_s, local_file))    
+      tmp_file = File.join('/', 'tmp', "#{(channel.properties[:host] + remote_file).gsub(/\/\./, '_')}_#{Time.now.strftime("%Y%m%d%H%M%S")}.tmp")
+      File.open(tmp_file, "w") do |f|
+        f.write data
+      end
+      puts `diff #{local_file} #{tmp_file}`
+      FileUtils.rm_f(tmp_file)
+    end
+  end
+
   # Render template (usually a config file) 
   # 
   # Usually we render it to a file on the local filesystem.

data/lib/deprec/recipes/cap.rb

@@ -1,27 +1,9 @@
 # Copyright 2009-2010 by le1t0@github. All rights reserved.
 
-# might be used in other scripts as well for checking differences with deployed configs for example
-# (if someone edited server configs by mistake, instead of editing inside the project)
-def compare_files(local_file, remote_file)
-  tmp_file = File.join('/', 'tmp', "capistrano_compare_#{Time.now.strftime("%Y%m%d%H%M%S")}.tmp")
-  File.open(tmp_file, 'w') do |f|
-    run "cat #{remote_file}" do |channel, stream, data|
-      f.write(data)
-    end
-  end
-
-  puts `diff #{local_file} #{tmp_file} && echo "files are the same!"`
-  FileUtils.rm_f(tmp_file)
-end
-
 Capistrano::Configuration.instance(:must_exist).load do
   namespace :deprec do
     namespace :cap do
 
-      task :compare do
-        compare_files(ENV["LOCAL"], ENV["REMOTE"])
-      end
-      
       desc "Show Capistrano variables"
       task :vars do
         y variables

metadata

@@ -2,7 +2,7 @@
 name: le1t0-deprec
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.1.6.070
+  version: 2.1.6.071
 platform: ruby
 authors: 
 - Le1t0
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-25 00:00:00 +01:00
+date: 2011-02-28 00:00:00 +01:00
 default_executable: depify
 dependencies: 
 - !ruby/object:Gem::Dependency