capistrano-shared-file 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e1eee643c665843a165fec2114bd677d8f0c024
-  data.tar.gz: 01d534b9072cef9a0f6a653ae38a6c435c56e0a2
+  metadata.gz: 8ab5fabc8685d9f182a0389d306d19fdd6051b12
+  data.tar.gz: 65055df25ad30bf44ebdf7108f5ea22817eb768f
 SHA512:
-  metadata.gz: 09696afa985ae72b31d5522eda84551f174da87d5fff8193e1a264d92e225c3519431ab9eeef5b9a9bc1825c22daeb79e955f79ffc694174bbb859e705a185bf
-  data.tar.gz: 5839efabdc0a3605a6cf2d65cad54679a4edf00d4f74436b456d9dee00dd17664909fa512d4af23885cce07b03c3f584dabad9b5fe100ec56bc4eb1fef5df048
+  metadata.gz: c86880a68661a0f00cd365569a26cdf1336f4ed4bbeac903d6649655140a8bccfbb4287ffff5d4d77744a2cf6a8406e3a77b4614fe9032554a7088de0624af59
+  data.tar.gz: 577355b64ae96d712ca29a1cf79da548008f48a929436f242a65bd19043e184f9c70052c1c0b8b0d9632072aedf6ef3935f3d4b90bcf04690ca04d1d54d94233

data/README.md

@@ -59,6 +59,14 @@ Enbales backups of your shared files when uploading and downloading shared files
 
 For more details on the implications of setting this variable to `true`, refer to the next **Upload** and **Download** sections.
 
+### shared_file_show_upload_diff
+
+When set, you will be prompted with the diff of any files that are changing due to your shared_file:upload. By default:
+
+    set :shared_file_show_upload_diff, true
+
+For more details on the implications of setting this variable to `true`, refer to the next **Upload** section.
+
 ## Tasks
 
 ### Upload
@@ -71,6 +79,10 @@ With backup (it creates a backup of the remote shared files on your machine befo
 
     bundle exec cap shared_file:upload -S shared_file_backup=true
 
+With show upload diff (downloads the existing file and displays the diff, prompting you to accept the changes):
+
+    bundle exec cap shared_file:upload -S shared_file_show_upload_diff=true
+
 ### Download
 
 To download all the files defined in the `shared_files` capistrano variable from a remote server, you can execute:

data/lib/capistrano/shared_file/tasks.rb

@@ -6,9 +6,10 @@ end
 
 Capistrano::Configuration.instance.load do
 
-  _cset :shared_files,       %w(config/database.yml)
-  _cset :shared_file_dir,    'files'
-  _cset :shared_file_backup, false
+  _cset :shared_files,                 %w(config/database.yml)
+  _cset :shared_file_dir,              'files'
+  _cset :shared_file_backup,           false
+  _cset :shared_file_show_upload_diff, true
 
   def remote_path_to(file)
     File.join(shared_path, shared_file_dir, file)
@@ -18,6 +19,17 @@ Capistrano::Configuration.instance.load do
     File.join(File.dirname(file), "#{Time.now.strftime('%Y%m%dT%H%M%S')}_#{File.basename(file)}")
   end
 
+  def confirm_upload_is_desired(backup_file, file)
+    diff_result = `git diff --no-index --color=always --ignore-space-at-eol #{backup_file} #{file}`
+    File.unlink(backup_file) unless shared_file_backup
+    unless $?.success?
+      puts "Showing diff for #{file}:"
+      puts diff_result
+      result = Capistrano::CLI.ui.ask("Are you sure that you want to upload your changes to #{file} (y/n)?", ['y','n'])
+      return (result == 'y')
+    end
+  end
+
   namespace :shared_file do
 
     desc 'Generate remote directories for shared files.'
@@ -32,10 +44,15 @@ Capistrano::Configuration.instance.load do
     desc 'Upload shared files to server'
     task :upload, :except => { :no_release => true } do
       shared_files.each do |file|
-        if shared_file_backup
-          top.download(remote_path_to(file), backup_path_to(file), :via => :scp)
+        if shared_file_backup || shared_file_show_upload_diff
+          backup_file = backup_path_to(file)
+          top.download(remote_path_to(file), backup_file, :via => :scp)
+          if shared_file_show_upload_diff
+            should_upload = confirm_upload_is_desired(backup_file, file)
+            puts "No changes made to #{file}!"
+          end
         end
-        top.upload(file, remote_path_to(file), :via => :scp)
+        top.upload(file, remote_path_to(file), :via => :scp) if !shared_file_show_upload_diff || should_upload
       end
     end
 

data/lib/capistrano/shared_file/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module SharedFile
-    VERSION = '1.1.1'
+    VERSION = '1.2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-shared-file
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Daniel Salmeron Amselem
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-06 00:00:00.000000000 Z
+date: 2014-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -66,3 +66,4 @@ signing_key:
 specification_version: 4
 summary: Capistrano recipe to upload, download and symlink shared files.
 test_files: []
+has_rdoc: