vagrant-orchestrate 0.7.2 → 0.8.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5f5be85b659c5c5022a04470ec6974461ba5706
-  data.tar.gz: adba283f307e946d40b4ce61d941d406a42a091f
+  metadata.gz: 808945cdd072496fc2196b7ae85bd717e8ca4c5e
+  data.tar.gz: 88709f5e06cd4dab1522565932949d784c4b3dc6
 SHA512:
-  metadata.gz: 9c66765c8ff0fd957b4b2dc9357c2e40779b3a5dbb271402e5b639b9647db633ff7a386feffae7a59ec06b41d7c94eae356810fd95735d23c0e587ca9db4852f
-  data.tar.gz: 1891a632f207db38a00f42e8bdb80f4ded5279012c0ede8750b5467d4c92725478fdb2dbe11d5bb6f1c26b8f1c175a2d7167588852c16c280391772d6ddab374
+  metadata.gz: 4f7adc7b6d305ba723ff4e2dcd9a1059dde926117e19693ffe1204112b122eb11250b006beeec3129b42ef3eb62d469066c3ac98c9b2a1679f93513ae99917e2
+  data.tar.gz: 87181a207c6dfda6229c3dd0953d1e4d5fd3f0d3e823b954262ab9c10eef09ef96a744b86f22cb61c2c3c11ed36ca8de40fd91e76bf2bb97180d9754acb9b37f

data/.rubocop.yml

@@ -16,5 +16,8 @@ StringLiterals:
 Style/FileName:
   Enabled: false
 
+Style/RegexpLiteral:
+  Enabled: false
+
 Metrics/AbcSize:
   Max: 100

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+0.8.0 (Unreleased)
+
+  - Add an action as part of the push command that will change ownership of all synced folders to the configured user to avoid permission conflicts.
+    - Added config.orchestrate.take_synced_file_ownership and documented in docs/config.md (default is true)
+    - Should have no impact on Windows systems, since `chown` is filtered out by the winrm communicator filter
+
 0.7.2 (September 25th, 2015)
 
   - Include windows guest directive on winrm template to correct issues with incorrect

data/docs/config.md

@@ -9,3 +9,11 @@ servers if there are any uncommitted or untracked files in your git repository.
 the `disable_commit_guard` configuration option will disable this protection.
 
     config.orchestrate.disable_commit_guard = true
+
+## `take_synced_folder_ownership`
+
+When multiple users are using Vagrant Orchestrate to push to the same target servers,
+there can arise permission issues for folders that are synced. When `true`, Vagrant
+Orchestrate will change ownership of the guestpath of all synced folders to be the
+`owner` specified in the `synced_folder` or the `ssh_info.username`. Has no affect
+for Windows guests. Default is `true`.

data/lib/vagrant-managed-servers/action/take_synced_folder_ownership.rb

@@ -0,0 +1,34 @@
+require "log4r"
+
+module VagrantPlugins
+  module ManagedServers
+    module Action
+      class TakeSyncedFolderOwnership
+        def initialize(app, _env)
+          @app    = app
+          @logger = Log4r::Logger.new("vagrant_managed_servers::action::take_synced_folder_ownership")
+        end
+
+        def call(env)
+          take_synced_folder_ownership env[:machine], env[:ui]
+          @app.call(env)
+        end
+
+        def take_synced_folder_ownership(machine, ui)
+          return unless machine.config.orchestrate.take_synced_folder_ownership
+          ui.info "Taking ownership of all guest synced folders"
+
+          machine.config.vm.synced_folders.each do |synced_folder|
+            name = synced_folder[0]
+            options = synced_folder[1]
+            next if options[:disabled]
+            options[:owner] ||= machine.ssh_info[:username]
+            @logger.debug "Taking ownership of #{name}"
+            @logger.debug options
+            machine.communicate.sudo "chown #{options[:owner]} -R #{options[:guestpath]}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-managed-servers/action.rb

@@ -1,5 +1,6 @@
 require "vagrant-managed-servers/action/upload_status"
 require "vagrant-managed-servers/action/init_deployment_tracker"
+require "vagrant-managed-servers/action/take_synced_folder_ownership"
 require "vagrant-managed-servers/action/track_deployment_start"
 require "vagrant-managed-servers/action/track_deployment_end"
 require "vagrant-managed-servers/action/track_server_deployment_start"
@@ -17,6 +18,7 @@ module VagrantPlugins
         Vagrant::Action::Builder.new.tap do |b|
           b.use TrackServerDeploymentStart
           b.use action_up
+          b.use TakeSyncedFolderOwnership
           b.use Call, action_provision do |env, b2|
             if env[:reboot]
               b2.use Call, action_reload do |_env, _b3|

data/lib/vagrant-orchestrate/config.rb

@@ -11,6 +11,7 @@ module VagrantPlugins
       attr_accessor :tracker_logging_enabled
       attr_accessor :credentials
       attr_accessor :disable_commit_guard
+      attr_accessor :take_synced_folder_ownership
 
       def initialize
         @filter_managed_commands = UNSET_VALUE
@@ -19,6 +20,7 @@ module VagrantPlugins
         @tracker_host = UNSET_VALUE
         @tracker_logging_enabled = UNSET_VALUE
         @disable_commit_guard = UNSET_VALUE
+        @take_synced_folder_ownership = UNSET_VALUE
         @credentials = Credentials.new
       end
 
@@ -50,6 +52,7 @@ module VagrantPlugins
         @tracker_host = nil if @tracker_host == UNSET_VALUE
         @tracker_logging_enabled = true if @tracker_logging_enabled == UNSET_VALUE
         @disable_commit_guard = false if @disable_commit_guard == UNSET_VALUE
+        @take_synced_folder_ownership = true if @take_synced_folder_ownership == UNSET_VALUE
         @credentials = nil if @credentials.unset?
         @credentials.finalize! if @credentials
       end

data/lib/vagrant-orchestrate/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Orchestrate
-    VERSION = "0.7.2"
+    VERSION = "0.8.0.pre.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-orchestrate
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0.pre.1
 platform: ruby
 authors:
 - Christopher Baldauf
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-25 00:00:00.000000000 Z
+date: 2015-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deployment-tracker-client
@@ -118,6 +118,7 @@ files:
 - lib/vagrant-managed-servers/action.rb
 - lib/vagrant-managed-servers/action/download_status.rb
 - lib/vagrant-managed-servers/action/init_deployment_tracker.rb
+- lib/vagrant-managed-servers/action/take_synced_folder_ownership.rb
 - lib/vagrant-managed-servers/action/track_deployment_end.rb
 - lib/vagrant-managed-servers/action/track_deployment_start.rb
 - lib/vagrant-managed-servers/action/track_server_deployment_end.rb
@@ -163,9 +164,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.14