le1t0-deprec 2.1.6.071 → 2.1.6.072

data/lib/deprec/capistrano_extensions.rb

@@ -35,17 +35,24 @@ module Deprec2
 
   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}`
+    tmpdir = "/tmp/#{Time.now.strftime("%Y%m%d%H%M%S")}.deprec"
+    
+    FileUtils.mkdir_p(tmpdir)
+    begin
+      download(remote_file, File.join(tmpdir, "$CAPISTRANO:HOST$#{remote_file.gsub(/[\/\.]/, '_')}.tmp"), { :via => :scp, :silent => true })
+    rescue Exception
+      # ignore errors, it just means the file doesn't exist on a specific server. This can be the case if the file only
+      # gets uploaded to servers with a specific role for example.
+    end
+    Dir.new(tmpdir).entries.collect { |e| File.file?(File.join(tmpdir, e)) ? File.join(tmpdir, e) : nil }.compact.each do |tmp_file|
+      hostname = File.basename(tmp_file).split(/_/).first
+      local_file_full_path = (File.exists?(File.join('config', stage, hostname, app.to_s, local_file)) ?
+                              File.join('config', stage, hostname, app.to_s, local_file) :
+                              File.join('config', stage, app.to_s, local_file))
+      puts `diff -u #{local_file_full_path} #{tmp_file}`
       FileUtils.rm_f(tmp_file)
     end
+    FileUtils.rmdir(tmpdir)
   end
 
   # Render template (usually a config file) 

data/lib/deprec.rb

@@ -42,6 +42,7 @@ Capistrano::Configuration.instance.deprec.namespaces.keys.each do |ns_name|
   unless ns.respond_to?(:check_roles)
     Capistrano::Configuration.instance.namespace :deprec do
       namespace ns_name do
+        desc "check if all roles are defined for :#{ns_name}"
         task :check_roles do
           user_defined_roles = roles.keys
           recipe_declared_roles = Capistrano::Configuration.instance.deprec.send(ns_name).tasks.collect { |k,v| v.options.has_key?(:roles) ? v.options[:roles] : nil }.compact.flatten.uniq
@@ -56,25 +57,24 @@ Capistrano::Configuration.instance.deprec.namespaces.keys.each do |ns_name|
   unless ns.respond_to?(:diff_config)
     Capistrano::Configuration.instance.namespace :deprec do
       namespace ns_name do
+        desc "perform local/remote diff on project configs for :#{ns_name}"
         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
+            deprec2.compare_files(ns_name, config_file[:path], config_file[:path])
+          end if defined?(PROJECT_CONFIG_FILES) && PROJECT_CONFIG_FILES[ns_name]
         end
 
+        desc "perform local/remote diff on system configs for :#{ns_name}"
         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
+            deprec2.compare_files(ns_name, config_file[:path], config_file[:path])
+          end if defined?(SYSTEM_CONFIG_FILES) && SYSTEM_CONFIG_FILES[ns_name]
         end
 
+        desc "perform local/remote diff on all configs for :#{ns_name}"
         task :diff_config do
-          diff_config_project
           diff_config_system
+          diff_config_project
         end
       end
     end

metadata

@@ -1,8 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: le1t0-deprec
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 2.1.6.071
+  hash: 239
+  prerelease: false
+  segments: 
+  - 2
+  - 1
+  - 6
+  - 72
+  version: 2.1.6.072
 platform: ruby
 authors: 
 - Le1t0
@@ -21,7 +27,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.5.18.022
+        hash: 33
+        segments: 
+        - 2
+        - 5
+        - 18
+        - 23
+        version: 2.5.18.023
   type: :runtime
   version_requirements: *id001
 description: "      This project provides libraries of Capistrano tasks and extensions to \n      remove the repetative manual work associated with installing services \n      on linux servers.\n"
@@ -279,17 +291,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: deployment recipes for capistrano