hem-tasks-rsync 2.3.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df599798222120f975034b064c8bcd75594f44c8
-  data.tar.gz: 9deebbbb074a46bca65f41875818949a181a5da2
+  metadata.gz: beacc1cb0322af29f8d32050646b29fe4aafcf53
+  data.tar.gz: 7d46d11304b50912820aafb45a7a3e6ebf033804
 SHA512:
-  metadata.gz: c6f682ae62f78b76c7f1b884900be470794dd76daa0e9cc0b7494dde492443f4d51f3f73c5a53911a783a8f13bc99dfccb27df9174f5ec81717ee736ad2e9cab
-  data.tar.gz: c43bbd2cdfdde7b4cb993dbc1ae30974305c99554292d1ac38f08de82da6eaadd70d7a9f071276071a02e5f5debf58764a743739030d5332033b27534533b089
+  metadata.gz: 1c8918e6e3b0676d2dd67e007507410107d918df4c9c3ff686d17b25c7651ade0723efccd728cdbf5e0154c4fe9812c3b411a54379310d4ea24c4e713b8d6375
+  data.tar.gz: 81477e4f3607a42d4defd8b73852b7a8b89bd3f85e633cf000f710340443b7c7a9e5e6f896d1d91944be7cdb3ca51a3d4a740e6e658a246eaf547eb73d945d4b

data/lib/hem/lib/patches/rake.rb

@@ -7,7 +7,7 @@ module Rake
 
       Hem::Metadata.to_store task_name
       task task_name => new_tasks | old_task.prerequisites do
-        new_task.call unless new_task.nil?
+        yield unless new_task.nil?
         old_task.invoke
       end
     end

data/lib/hem/tasks/rsync/deps.rb

@@ -1,8 +1,7 @@
 #!/usr/bin/env ruby
 # ^ Syntax hint
 
-before 'deps:composer', 'deps:sync:composer_files_to_guest'
-after 'deps:composer', 'deps:sync:reload_or_sync'
+after 'deps:composer', 'deps:sync:vendor_directory'
 
 after 'vm:reload', 'deps:composer_preload'
 after 'vm:start', 'deps:composer_preload'
@@ -16,8 +15,6 @@ namespace :deps do
 
     Rake::Task['tools:composer'].invoke
 
-    Rake::Task['deps:sync:composer_files_to_guest'].execute
-
     packages = args[:packages].map(&:shellescape).join(' ')
 
     Hem.ui.title 'Updating composer dependencies'
@@ -33,9 +30,6 @@ namespace :deps do
           begin
             shell(*args)
 
-            Rake::Task['deps:sync:composer_files_to_guest'].execute
-            Rake::Task['vm:rsync_mount_sync'].execute
-
             complete = true
           rescue Hem::ExternalCommandError
             Hem.ui.warning 'Updating composer dependencies locally failed!'
@@ -43,12 +37,9 @@ namespace :deps do
         end
       end
 
-      unless complete
-        run(*args)
+      run(*args) unless complete
 
-        Rake::Task['deps:sync:composer_files_from_guest'].execute
-        Rake::Task['deps:sync:vendor_directory_from_guest'].execute
-      end
+      Rake::Task['deps:sync:vendor_directory'].execute
 
       Hem.ui.success 'Composer dependencies updated'
     end
@@ -59,36 +50,29 @@ namespace :deps do
   desc 'Preload the composer files into file system cache'
   task :composer_preload do
     Hem.ui.title 'Composer PHP files loading into file system cache'
-    run 'if [ -e vendor ]; then find vendor -type f -name "*.php" -exec cat {} > /dev/null + ; fi', realtime: true
+    command = <<-COMMAND
+        if [ -e vendor ]; then \
+          find vendor -type f -name "*.php" -exec cat {} > /dev/null + ; \
+        fi
+        COMMAND
+    run command, realtime: true
     Hem.ui.success 'Composer PHP files loaded into file system cache'
   end
 
   desc 'Syncing dependencies to/from the VM'
   namespace :sync do
-    desc 'Download the composer.json and lock from the guest to the host'
-    task :composer_files_from_guest do
-      Hem.ui.title 'Downloading composer files to host'
+    desc 'Syncing vendor directory changes, in either direction'
+    task :vendor_directory do
+      Hem.ui.title 'Syncing vendor directory changes'
 
-      Rake::Task['vm:rsync_manual'].execute(
-        from_path: File.join(Hem.project_config.vm.project_mount_path, 'composer.json'),
-        to_path: File.join(Hem.project_path, 'composer.json'),
-        is_reverse: true
-      )
-      Rake::Task['vm:rsync_manual'].execute(
-        from_path: File.join(Hem.project_config.vm.project_mount_path, 'composer.lock'),
-        to_path: File.join(Hem.project_path, 'composer.lock'),
-        is_reverse: true
+      Rake::Task['vm:sync_guest_changes'].execute(
+        from_path: 'vendor/',
+        to_path: 'vendor',
+        deciding_file_path: File.join('vendor', 'autoload.php')
       )
-      Hem.ui.success 'Downloaded composer files to host'
-    end
-
-    desc 'Upload the composer.json and lock from the host to the guest'
-    task :composer_files_to_guest do
-      Hem.ui.title 'Uploading composer files to guest'
-
-      Rake::Task['vm:upload_root_files_to_guest'].invoke
 
-      Hem.ui.success('Uploaded composer files to guest')
+      Hem.ui.success 'Synced vendor directory changes'
+      Hem.ui.separator
     end
 
     desc 'Download the vendor directory from the guest to the host'
@@ -97,10 +81,10 @@ namespace :deps do
 
       Rake::Task['vm:sync_guest_changes'].execute(
         from_path: 'vendor/',
-        to_path: 'vendor',
-        deciding_file_path: File.join('vendor', 'autoload.php'),
-        host_to_guest_allowed: false
+        to_path: 'vendor'
       )
+
+      Hem.ui.success('Downloaded vendor directory changes from guest')
     end
 
     desc 'Upload the vendor directory from the host to the guest'
@@ -114,18 +98,5 @@ namespace :deps do
 
       Hem.ui.success('Uploaded vendor directory changes to guest')
     end
-
-    desc 'Reload the VM to use NFS mounts per directory, or sync rsync mounts if already enabled'
-    task :reload_or_sync do
-      one_mount_point = run 'grep "/vagrant " /proc/mounts || true', capture: true
-      if one_mount_point != ''
-        Rake::Task['vm:reload'].execute
-        Rake::Task['vm:provision_shell'].execute
-        Rake::Task['vm:upload_root_files_to_guest'].execute
-      else
-        Rake::Task['deps:sync:vendor_directory_from_guest'].execute
-        Rake::Task['vm:rsync_mount_sync'].execute
-      end
-    end
   end
 end

data/lib/hem/tasks/rsync/version.rb

@@ -1,7 +1,7 @@
 module Hem
   module Tasks
     module Rsync
-      VERSION = '2.3.0'.freeze
+      VERSION = '3.0.0'.freeze
     end
   end
 end

data/lib/hem/tasks/rsync/vm.rb

@@ -2,47 +2,9 @@
 # ^ Syntax hint
 
 after 'vm:reload', 'vm:provision_shell'
-after 'vm:reload', 'vm:upload_root_files_to_guest'
 after 'vm:start', 'vm:provision_shell'
-after 'vm:start', 'vm:upload_root_files_to_guest'
 
 namespace :vm do
-  desc 'Trigger a sync to occur for rsync mountpoints'
-  task :rsync_mount_sync do
-    vagrantfile do
-      Hem.ui.title 'Syncing directories'
-      vagrant_exec 'rsync'
-      Hem.ui.success('Vendor directory synced')
-    end
-  end
-
-  desc 'Rsync any files in the project root the guest'
-  task :upload_root_files_to_guest do
-    one_mount_point = run 'grep "/vagrant " /proc/mounts || true', capture: true
-    next unless one_mount_point == ''
-
-    Hem.ui.title 'Uploading project root files to the guest'
-
-    files = shell "find '#{Hem.project_path}' -type f -maxdepth 1 -print0",
-                  local: true, on: :host, capture: true, pwd: Hem.project_path
-
-    next unless files
-
-    run "sudo chown vagrant:vagrant '#{Hem.project_config.vm.project_mount_path}'", realtime: true
-
-    rsync_command = <<-COMMAND
-      find '.' -type f -maxdepth 1 -print0 | \
-      rsync --files-from=- --from0 --human-readable --progress \
-      --verbose --compress --archive --rsh='%s' \
-      '#{Hem.project_path}' 'default:#{Hem.project_config.vm.project_mount_path}'
-      COMMAND
-    args = [rsync_command, { local: true, realtime: true, indent: 2, on: :host, pwd: Hem.project_path }]
-    require_relative File.join('..', '..', 'lib', 'vm', 'ReverseCommand')
-    Hem::Lib::Vm::ReverseCommand.new(*args).run
-
-    Hem.ui.success 'Uploaded project root files to the guest'
-  end
-
   desc 'Rsync from host to guest, or if in reverse mode, from guest to host'
   argument :from_path
   argument :to_path
@@ -90,6 +52,8 @@ namespace :vm do
   argument :deciding_file_path
   argument :host_to_guest_allowed, optional: true, default: true
   task :sync_guest_changes do |_task_name, args|
+    args[:host_to_guest_allowed] = true unless args.key? :host_to_guest_allowed
+
     Hem.ui.title "Determining if #{args[:deciding_file_path]} is newer on the host or guest"
 
     local_file_path = File.join(Hem.project_path, args[:deciding_file_path])
@@ -112,8 +76,8 @@ namespace :vm do
       )
     elsif args[:host_to_guest_allowed] && local_file_modified.to_i > remote_file_modified.to_i
       Hem.ui.success("Host file #{args[:deciding_file_path]} is newer, syncing to guest")
-      from_path = File.join(Hem.project_path, args[:to_path])
-      to_path = File.join(Hem.project_config.vm.project_mount_path, args[:from_path])
+      from_path = File.join(Hem.project_path, args[:from_path])
+      to_path = File.join(Hem.project_config.vm.project_mount_path, args[:to_path])
 
       Rake::Task['vm:rsync_manual'].execute(
         from_path: from_path,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hem-tasks-rsync
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Kieren Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-21 00:00:00.000000000 Z
+date: 2016-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler