Merge pull request #90 from Temikus/new_rsync_fix

Removing old rsync plugin. Adding acceptance tests for new behaviour.

CHANGELOG.md

@@ -4,6 +4,8 @@
 * Added support for preemptible instances [jcdang]
 * Implemented auto_restart and on_host_maintenance options [jcdang]
 * Added support for IP address specification by name [temikus]
+* Instance name now defaults to time + uuid [temikus]
+* Removed legacy rsync code, switched to Vagrant built-in SyncedFolders [temikus]
 * Implemented vagrant halt and reload actions [temikus]
 * Switched to fog-google metagem [temikus]
 * Added a linter and custom acceptance tests [temikus]

README.md

@@ -176,8 +176,8 @@ This provider exposes quite a few provider-specific configuration options:
 * `can_ip_forward` - Boolean whether to enable IP Forwarding.
 * `external_ip` - The external IP address to use (supports names).
 * `preemptible` - Boolean whether to enable preemptibility. Default is false.
-* `auto_restart` - Boolean whether to enable auto_restart. Default is true.  
-* `on_host_maintenance` - What to do on host maintenance. Default is "MIGRATE".  
+* `auto_restart` - Boolean whether to enable auto_restart. Default is true.
+* `on_host_maintenance` - What to do on host maintenance. Default is "MIGRATE".
 * `service_accounts` or `scopes` - An array of OAuth2 account scopes for
   services that the instance will have access to. Those can be both full API
   scopes and just endpoint aliases (the part after `...auth/`), for example:
@@ -247,9 +247,7 @@ There is minimal support for synced folders. Upon `vagrant up`,
 `vagrant reload`, and `vagrant provision`, the Google provider will use
 `rsync` (if available) to uni-directionally sync the folder to the remote
 machine over SSH.
-
-This is good enough for all built-in Vagrant provisioners (`shell`, `chef`, and
-`puppet`) to work!
+See [Vagrant Synced folders: rsync](https://docs.vagrantup.com/v2/synced-folders/rsync.html)
 
 ## Development
 

lib/vagrant-google/action.rb

@@ -66,7 +66,7 @@ def self.action_provision
             end
 
             b2.use Provision
-            b2.use SyncFolders
+            b2.use SyncedFolders
           end
         end
       end
@@ -144,7 +144,7 @@ def self.action_up
               end
             else
               b1.use Provision
-              b1.use SyncFolders
+              b1.use SyncedFolders
               b1.use WarnNetworks
               b1.use RunInstance
             end
@@ -182,7 +182,6 @@ def self.action_reload
       autoload :RunInstance, action_root.join("run_instance")
       autoload :StartInstance, action_root.join("start_instance")
       autoload :StopInstance, action_root.join("stop_instance")
-      autoload :SyncFolders, action_root.join("sync_folders")
       autoload :TerminateInstance, action_root.join("terminate_instance")
       autoload :TimedProvision, action_root.join("timed_provision")
       autoload :WarnNetworks, action_root.join("warn_networks")

tasks/acceptance.rake

@@ -22,7 +22,7 @@ namespace :acceptance do
   desc "runs acceptance tests using vagrant-spec"
   task :run do
 
-    yellow "NOTE: For acceptance tests to be functional, correct ssh key needs to be added to GCE metadata.\033[0m"
+    yellow "NOTE: For acceptance tests to be functional, correct ssh key needs to be added to GCE metadata."
 
     if !ENV["GOOGLE_JSON_KEY_LOCATION"] && !ENV["GOOGLE_KEY_LOCATION"]
       abort ("Environment variables GOOGLE_JSON_KEY_LOCATION or GOOGLE_KEY_LOCATION are not set. Aborting.")
@@ -44,6 +44,7 @@ namespace :acceptance do
       multi_instance
       preemptible
       scopes
+      synced_folder/rsync
       provisioner/shell
       provisioner/chef-solo
     ).map{ |s| "provider/google/#{s}" }